[U-Boot] [PATCH] lib: Add CONFIG_FDT_IGNORE_FIXUP_MEMORY_NODE

[Nobuhiro Iwamatsu]

Usually, when CONFIG_OF_LIBFDT is enabled, U-Boot is set to
the FDT memory information that is set in the U-Boot. This patch
disables this behavior.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj at renesas.com>
---
 README                   | 8 ++++++++
 arch/arm/lib/bootm-fdt.c | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/README b/README
index d337374..73453fe 100644
--- a/README
+++ b/README
@@ -650,6 +650,14 @@ The following options need to be configured:
 		in a single configuration file and the machine type is
 		runtime discoverable, do not have to use this setting.
 
+		CONFIG_FDT_IGNORE_FIXUP_MEMORY_NODE
+
+		Usually, when CONFIG_OF_LIBFDT is enabled, U-Boot is set to
+		the FDT memory information that is set in the U-Boot. This will
+		disable this behavior.
+		If you do not use the memory configuration of U-Boot, you want
+		to set the priority of the FDT, please enable this.
+
 - vxWorks boot parameters:
 
 		bootvx constructs a valid bootline using the following
diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c
index e40691d..8da9dac 100644
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -18,6 +18,7 @@
 #include <common.h>
 #include <fdt_support.h>
 
+#ifndef CONFIG_FDT_IGNORE_FIXUP_MEMORY_NODE
 DECLARE_GLOBAL_DATA_PTR;
 
 int arch_fixup_memory_node(void *blob)
@@ -34,3 +35,4 @@ int arch_fixup_memory_node(void *blob)
 
 	return fdt_fixup_memory_banks(blob, start, size, CONFIG_NR_DRAM_BANKS);
 }
+#endif  /* CONFIG_FDT_IGNORE_FIXUP_MEMORY_NODE */
-- 
1.8.5