diff options
| author | Ma Haijun <mahaijuns@gmail.com> | 2014-07-12 14:24:06 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 17:19:49 +0200 |
| commit | e29607ed972056723e4bf0ac90767421cf0f0b78 (patch) | |
| tree | 6e2f8023065d2f222955881c2a398048b735cbed /arch/arm/lib | |
| parent | 38510a4b34a699a534121ad3cb9096cc0fd7a86e (diff) | |
| download | blackbird-obmc-uboot-e29607ed972056723e4bf0ac90767421cf0f0b78.tar.gz blackbird-obmc-uboot-e29607ed972056723e4bf0ac90767421cf0f0b78.zip | |
ARM: convert arch_fixup_memory_node to a generic FDT fixup function
Some architecture needs extra device tree setup. Instead of adding
yet another hook, convert arch_fixup_memory_node to be a generic
FDT fixup function.
[maz: collapsed 3 patches into one, rewrote commit message]
Signed-off-by: Ma Haijun <mahaijuns@gmail.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/bootm-fdt.c | 2 | ||||
| -rw-r--r-- | arch/arm/lib/bootm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index e40691d15f..8394e15b7e 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -20,7 +20,7 @@ DECLARE_GLOBAL_DATA_PTR; -int arch_fixup_memory_node(void *blob) +int arch_fixup_fdt(void *blob) { bd_t *bd = gd->bd; int bank; diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index a08586f1eb..178e8fb9e4 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -359,7 +359,7 @@ void boot_prep_vxworks(bootm_headers_t *images) if (images->ft_addr) { off = fdt_path_offset(images->ft_addr, "/memory"); if (off < 0) { - if (arch_fixup_memory_node(images->ft_addr)) + if (arch_fixup_fdt(images->ft_addr)) puts("## WARNING: fixup memory failed!\n"); } } |
