Revert "libfdt: Add option to disable arch_fixup_fdt() calls"

This reverts commit fd03516f7b53e135e1cb0029a899851a01d0fbde.

This patch went to mainline with positive logic that's why revert this
patch and apply mainline one instead.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/Kconfig b/Kconfig
index f25dd7b717478f4417d6b2aca45d0a5967102cef..3ceff250321e2d3c50575939f100317369247d49 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -319,14 +319,6 @@ 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 6e87b59ad4c6bdea1a46617cdfe98647e64c7b02..76b75d8e4643ee9a018c216c15301de2ae15f3d4 100644 (file)
--- a/arch/arm/lib/bootm-fdt.c
+++ b/arch/arm/lib/bootm-fdt.c
@@ -24,7 +24,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_DISABLE_ARCH_FIXUP_FDT
 int arch_fixup_fdt(void *blob)
 {
        bd_t *bd = gd->bd;
@@ -54,4 +53,3 @@ int arch_fixup_fdt(void *blob)
 
        return 0;
 }
-#endif

diff --git a/common/image-fdt.c b/common/image-fdt.c
index 9e05becd464a576e8ee0006e6b7c5ab6f1394566..6cac7dbb7f8b2ff0fe5114b9d65ba655e3bf2fc3 100644 (file)
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -460,9 +460,6 @@ __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;
 }