diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-12-27 00:22:24 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-12-27 00:22:24 +0100 |
| commit | bd878eb024bf9cb351c9ce66db63558de2d0e395 (patch) | |
| tree | 6235c6e37a66e07471448598e8e0d16a78dbc678 /board | |
| parent | 467bcee11fe26ad422f2de971aa70866079870f2 (diff) | |
| parent | c01b17dd856fa120b2970f50d9598546a4927ec3 (diff) | |
| download | u-boot-imx-bd878eb024bf9cb351c9ce66db63558de2d0e395.zip u-boot-imx-bd878eb024bf9cb351c9ce66db63558de2d0e395.tar.gz u-boot-imx-bd878eb024bf9cb351c9ce66db63558de2d0e395.tar.bz2 | |
Merge branch 'testing' of git://www.denx.de/git/u-boot-fdt
Diffstat (limited to 'board')
| -rw-r--r-- | board/cm5200/cm5200.c | 15 | ||||
| -rw-r--r-- | board/ids8247/ids8247.c | 17 |
2 files changed, 5 insertions, 27 deletions
diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index 4a86d3c..79fb71d 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -263,7 +263,6 @@ static void ft_blob_update(void *blob, bd_t *bd) { int len, ret, nodeoffset = 0; char module_name[MODULE_NAME_MAXLEN] = {0}; - ulong memory_data[2] = {0}; compose_module_name(hw_id, module_name); len = strlen(module_name) + 1; @@ -273,22 +272,12 @@ static void ft_blob_update(void *blob, bd_t *bd) printf("ft_blob_update(): cannot set /model property err:%s\n", fdt_strerror(ret)); - memory_data[0] = cpu_to_be32(bd->bi_memstart); - memory_data[1] = cpu_to_be32(bd->bi_memsize); + ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); - nodeoffset = fdt_path_offset (blob, "/memory"); - if (nodeoffset >= 0) { - ret = fdt_setprop(blob, nodeoffset, "reg", memory_data, - sizeof(memory_data)); - if (ret < 0) + if (ret < 0) { printf("ft_blob_update): cannot set /memory/reg " "property err:%s\n", fdt_strerror(ret)); } - else { - /* memory node is required in dts */ - printf("ft_blob_update(): cannot find /memory node " - "err:%s\n", fdt_strerror(nodeoffset)); - } } #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */ diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c index b05424d..7176770 100644 --- a/board/ids8247/ids8247.c +++ b/board/ids8247/ids8247.c @@ -329,25 +329,14 @@ nand_init (void) */ void ft_blob_update(void *blob, bd_t *bd) { - int ret, nodeoffset = 0; - ulong memory_data[2] = {0}; + int ret; - memory_data[0] = cpu_to_be32(bd->bi_memstart); - memory_data[1] = cpu_to_be32(bd->bi_memsize); + ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); - nodeoffset = fdt_find_node_by_path (blob, "/memory"); - if (nodeoffset >= 0) { - ret = fdt_setprop(blob, nodeoffset, "reg", memory_data, - sizeof(memory_data)); - if (ret < 0) + if (ret < 0) { printf("ft_blob_update): cannot set /memory/reg " "property err:%s\n", fdt_strerror(ret)); } - else { - /* memory node is required in dts */ - printf("ft_blob_update(): cannot find /memory node " - "err:%s\n", fdt_strerror(nodeoffset)); - } } void ft_board_setup(void *blob, bd_t *bd) |