diff options
author | Tom Rini <trini@ti.com> | 2014-07-29 09:41:35 -0400 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-07-29 09:41:35 -0400 |
commit | 362f16b1e9e94024a511adae9977d145ef942b50 (patch) | |
tree | e0e359fb074493fa8deab65abe0feb4b8fefde3a /common/image-fdt.c | |
parent | 302e609fe653baf1ae3a7573d2f4eafd86ab696b (diff) | |
parent | 9d195a546179bc732aba9eacccf0a9a3db591288 (diff) | |
download | u-boot-imx-362f16b1e9e94024a511adae9977d145ef942b50.zip u-boot-imx-362f16b1e9e94024a511adae9977d145ef942b50.tar.gz u-boot-imx-362f16b1e9e94024a511adae9977d145ef942b50.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/image-fdt.c')
-rw-r--r-- | common/image-fdt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/common/image-fdt.c b/common/image-fdt.c index 9fc7481..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); @@ -492,7 +495,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, if (!ft_verify_fdt(blob)) return -1; -#ifdef CONFIG_SOC_K2HK +#if defined(CONFIG_SOC_KEYSTONE) if (IMAGE_OF_BOARD_SETUP) ft_board_setup_ex(blob, gd->bd); #endif |