summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMa Haijun <mahaijuns@gmail.com>2014-07-12 14:24:06 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-07-28 17:19:49 +0200
commite29607ed972056723e4bf0ac90767421cf0f0b78 (patch)
tree6e2f8023065d2f222955881c2a398048b735cbed /common
parent38510a4b34a699a534121ad3cb9096cc0fd7a86e (diff)
downloadu-boot-imx-e29607ed972056723e4bf0ac90767421cf0f0b78.zip
u-boot-imx-e29607ed972056723e4bf0ac90767421cf0f0b78.tar.gz
u-boot-imx-e29607ed972056723e4bf0ac90767421cf0f0b78.tar.bz2
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 'common')
-rw-r--r--common/image-fdt.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/common/image-fdt.c b/common/image-fdt.c
index 7795b80..db6e395 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -450,7 +450,7 @@ __weak int ft_verify_fdt(void *fdt)
return 1;
}
-__weak int arch_fixup_memory_node(void *blob)
+__weak int arch_fixup_fdt(void *blob)
{
return 0;
}
@@ -467,7 +467,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob,
puts(" - must RESET the board to recover.\n");
return -1;
}
- arch_fixup_memory_node(blob);
+ if (arch_fixup_fdt(blob) < 0) {
+ puts("ERROR: arch specific fdt fixup failed");
+ return -1;
+ }
if (IMAGE_OF_BOARD_SETUP)
ft_board_setup(blob, gd->bd);
fdt_fixup_ethernet(blob);