summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-08-10 22:20:27 +0200
committerWolfgang Denk <wd@denx.de>2010-08-10 22:20:27 +0200
commit201532a69cf7e7a84bff354fdab45947425d22b4 (patch)
tree4a09ca44e9fb720ec5b6ef29cca2de627e29f29a /arch
parent560639806da5172147a3b1ebd99839feac38b718 (diff)
parentb417260d871d4d8d336c160d95ed40cc8c0fb0fa (diff)
downloadu-boot-imx-201532a69cf7e7a84bff354fdab45947425d22b4.zip
u-boot-imx-201532a69cf7e7a84bff354fdab45947425d22b4.tar.gz
u-boot-imx-201532a69cf7e7a84bff354fdab45947425d22b4.tar.bz2
Merge branch 'master' of ../master
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/lib/bootm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 3064121..4c3e2fe 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -253,7 +253,7 @@ static int boot_body_linux(bootm_headers_t *images)
if (ret)
return ret;
-#if defined(CONFIG_OF_LIBFDT)
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_SYS_BOOTMAPSZ)
ret = boot_relocate_fdt(lmb, bootmap_base, of_flat_tree, &of_size);
if (ret)
return ret;
@@ -292,7 +292,7 @@ static int boot_body_linux(bootm_headers_t *images)
if (*initrd_start && *initrd_end)
fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);
}
-#endif /* CONFIG_OF_LIBFDT */
+#endif /* CONFIG_OF_LIBFDT && CONFIG_SYS_BOOTMAPSZ */
return 0;
}