summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-07-28 07:06:41 (GMT)
committerSimon Glass <sjg@chromium.org>2016-08-01 01:37:08 (GMT)
commite2f88dfd2d9671945877daf5a8c9223b864c34d1 (patch)
tree6d2e31420dea6edd8a46bf7d24f8514e1c574c50 /arch/mips
parent26fb8db0f4d1e7c118b5e8f3a8849f359b91c166 (diff)
downloadu-boot-fsl-qoriq-e2f88dfd2d9671945877daf5a8c9223b864c34d1.tar.xz
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/mips')
-rw-r--r--arch/mips/lib/bootm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c
index aa0475a..0c6a4ab 100644
--- a/arch/mips/lib/bootm.c
+++ b/arch/mips/lib/bootm.c
@@ -253,6 +253,7 @@ static int boot_reloc_fdt(bootm_headers_t *images)
#endif
}
+#ifdef CONFIG_ARCH_FIXUP_FDT
int arch_fixup_fdt(void *blob)
{
#if CONFIG_IS_ENABLED(MIPS_BOOT_FDT) && CONFIG_IS_ENABLED(OF_LIBFDT)
@@ -264,6 +265,7 @@ int arch_fixup_fdt(void *blob)
return 0;
#endif
}
+#endif
static int boot_setup_fdt(bootm_headers_t *images)
{