summaryrefslogtreecommitdiff
path: root/arch/arm/lib/bootm.c
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-07-28 09:06:41 +0200
committerSimon Glass <sjg@chromium.org>2016-07-31 19:37:08 -0600
commite2f88dfd2d9671945877daf5a8c9223b864c34d1 (patch)
tree6d2e31420dea6edd8a46bf7d24f8514e1c574c50 /arch/arm/lib/bootm.c
parent26fb8db0f4d1e7c118b5e8f3a8849f359b91c166 (diff)
downloadu-boot-imx-e2f88dfd2d9671945877daf5a8c9223b864c34d1.zip
u-boot-imx-e2f88dfd2d9671945877daf5a8c9223b864c34d1.tar.gz
u-boot-imx-e2f88dfd2d9671945877daf5a8c9223b864c34d1.tar.bz2
libfdt: Introduce new ARCH_FIXUP_FDT option
Add new Kconfig option to disable arch_fixup_fdt() calls for cases where U-Boot shouldn't update memory setup in DTB file. One example of usage of this option is to boot OS with different memory setup than U-Boot use. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/lib/bootm.c')
-rw-r--r--arch/arm/lib/bootm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index c20ef22..f9ed7fe 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -367,8 +367,10 @@ void boot_prep_vxworks(bootm_headers_t *images)
if (images->ft_addr) {
off = fdt_path_offset(images->ft_addr, "/memory");
if (off < 0) {
+#ifdef CONFIG_ARCH_FIXUP_FDT
if (arch_fixup_fdt(images->ft_addr))
puts("## WARNING: fixup memory failed!\n");
+#endif
}
}
#endif