diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-11-27 21:59:46 -0600 |
|---|---|---|
| committer | Gerald Van Baren <vanbaren@cideas.com> | 2007-12-07 20:51:25 -0500 |
| commit | 246d4ae6bc282bc1841224e1c5fc49dc925e0bf7 (patch) | |
| tree | 84fb928c64281c6aaff95c1aa1868543ddf453d6 /cpu/mpc83xx/cpu.c | |
| parent | 151c8b09b35eebe8fd9139cb6c1d91c27b22f058 (diff) | |
| download | u-boot-imx-246d4ae6bc282bc1841224e1c5fc49dc925e0bf7.zip u-boot-imx-246d4ae6bc282bc1841224e1c5fc49dc925e0bf7.tar.gz u-boot-imx-246d4ae6bc282bc1841224e1c5fc49dc925e0bf7.tar.bz2 | |
Convert boards that set memory node to use fdt_fixup_memory()
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'cpu/mpc83xx/cpu.c')
| -rw-r--r-- | cpu/mpc83xx/cpu.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index b2c35d3..f1ea17d 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -35,6 +35,7 @@ #include <ft_build.h> #elif defined(CONFIG_OF_LIBFDT) #include <libfdt.h> +#include <fdt_support.h> #endif DECLARE_GLOBAL_DATA_PTR; @@ -526,7 +527,6 @@ ft_cpu_setup(void *blob, bd_t *bd) int nodeoffset; int err; int j; - int tmp[2]; for (j = 0; j < (sizeof(fixup_props) / sizeof(fixup_props[0])); j++) { nodeoffset = fdt_path_offset(blob, fixup_props[j].node); @@ -543,21 +543,7 @@ ft_cpu_setup(void *blob, bd_t *bd) } } - /* update, or add and update /memory node */ - nodeoffset = fdt_path_offset(blob, "/memory"); - if (nodeoffset < 0) { - nodeoffset = fdt_add_subnode(blob, 0, "memory"); - if (nodeoffset < 0) - debug("failed to add /memory node: %s\n", - fdt_strerror(nodeoffset)); - } - if (nodeoffset >= 0) { - fdt_setprop(blob, nodeoffset, "device_type", - "memory", sizeof("memory")); - tmp[0] = cpu_to_be32(bd->bi_memstart); - tmp[1] = cpu_to_be32(bd->bi_memsize); - fdt_setprop(blob, nodeoffset, "reg", tmp, sizeof(tmp)); - } + fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); } #elif defined(CONFIG_OF_FLAT_TREE) void |