From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 9 Jun 2016 14:00:30 +0000 (+0200)
Subject: libfdt: Add option to disable arch_fixup_fdt() calls
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd03516f7b53e135e1cb0029a899851a01d0fbde;p=thirdparty%2Fu-boot.git

libfdt: Add option to disable arch_fixup_fdt() calls

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>
---

diff --git a/Kconfig b/Kconfig
index 3ceff250321..f25dd7b7174 100644
--- a/Kconfig
+++ b/Kconfig
@@ -319,6 +319,14 @@ config SYS_CLK_FREQ
 	help
 	  TODO: Move CONFIG_SYS_CLK_FREQ for all the architecture
 
+config DISABLE_ARCH_FIXUP_FDT
+	bool "Disable arch_fixup_fdt() call"
+	depends on ARM
+	help
+	  Disable FDT memory map syncup before OS boot. This feature can be
+	  used for booting OS with different memory setup where the part of
+	  the memory location should be used for different purpose.
+
 endmenu		# Boot images
 
 source "common/Kconfig"
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index 76b75d8e464..6e87b59ad4c 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -24,6 +24,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifndef CONFIG_DISABLE_ARCH_FIXUP_FDT
 int arch_fixup_fdt(void *blob)
 {
 	bd_t *bd = gd->bd;
@@ -53,3 +54,4 @@ int arch_fixup_fdt(void *blob)
 
 	return 0;
 }
+#endif
diff --git a/common/image-fdt.c b/common/image-fdt.c
index 6cac7dbb7f8..9e05becd464 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -460,6 +460,9 @@ __weak int ft_verify_fdt(void *fdt)
 
 __weak int arch_fixup_fdt(void *blob)
 {
+#ifdef CONFIG_DISABLE_ARCH_FIXUP_FDT
+	printf("## Disable arch_fixup_fdt()\n");
+#endif
 	return 0;
 }