Convert CONFIG_SYS_FDT_PAD to Kconfig

This converts the following to Kconfig:
   CONFIG_SYS_FDT_PAD

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/boot/image-fdt.c b/boot/image-fdt.c
index 5e5b246..e75d051 100644 (file)
--- a/boot/image-fdt.c
+++ b/boot/image-fdt.c
@@ -24,10 +24,6 @@
 #include <dm/ofnode.h>
 #include <tee/optee.h>
 
-#ifndef CONFIG_SYS_FDT_PAD
-#define CONFIG_SYS_FDT_PAD 0x3000
-#endif
-
 /* adding a ramdisk needs 0x44 bytes in version 2008.10 */
 #define FDT_RAMDISK_OVERHEAD   0x80
 

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 1ba48e5..11a3db5 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -299,7 +299,6 @@
 
 #define CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_DPAA_PME
-#define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 
 #ifdef CONFIG_FMAN_ENET
 #define CONFIG_SYS_FM1_DTSEC1_PHY_ADDR 0x2

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index f5e07a9..a5461d7 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -413,8 +413,6 @@
 #define CONFIG_SYS_QMAN_SWP_ISDR_REG   0xE08
 
 #define CONFIG_SYS_DPAA_FMAN
-
-#define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index 7983a71..560083c 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -388,8 +388,6 @@
 
 #define CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_DPAA_PME
-
-#define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_FMAN_ENET

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 9d43d87..fc068c9 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -411,8 +411,6 @@
 #define CONFIG_SYS_DPAA_DCE
 #define CONFIG_SYS_DPAA_RMAN           /* RMan */
 #define CONFIG_SYS_INTERLAKEN
-
-#define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 9a9920a..056e2d1 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -365,8 +365,6 @@
 #define CONFIG_SYS_DPAA_DCE
 #define CONFIG_SYS_DPAA_RMAN           /* RMan */
 #define CONFIG_SYS_INTERLAKEN
-
-#define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 4280c2d..bba82f1 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -368,8 +368,6 @@
 #define CONFIG_SYS_DPAA_DCE
 #define CONFIG_SYS_DPAA_RMAN
 #define CONFIG_SYS_INTERLAKEN
-
-#define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif /* CONFIG_NOBQFMAN */
 
 #ifdef CONFIG_SYS_DPAA_FMAN

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 5f3fd89..7e65b2b 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -293,7 +293,6 @@
 
 #define CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_DPAA_PME
-#define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 
 #ifdef CONFIG_FMAN_ENET
 #define CONFIG_SYS_FM1_DTSEC1_PHY_ADDR 0x1c

diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index 589ba61..0d470c4 100644 (file)
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -385,8 +385,6 @@ int get_scl(void);
 #define CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_DPAA_PME
 
-#define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
-
 /* Qman / Bman */
 /* RGMII (FM1@DTESC5) is local managemant interface */
 #define CONFIG_SYS_RGMII2_PHY_ADDR             0x11

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index 43f30fd..1fb1d05 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -114,8 +114,6 @@
 #define CONFIG_SYS_DPAA_FMAN
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_FM_MURAM_SIZE       0x60000
-
-#define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif
 #endif
 

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 2e48ea0..e5fb111 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -87,7 +87,6 @@
 #ifdef CONFIG_SYS_DPAA_FMAN
 #define CONFIG_SYS_FM_MURAM_SIZE       0x60000
 #endif
-#define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 #endif
 
 /* Miscellaneous configurable options */

diff --git a/lib/Kconfig b/lib/Kconfig
index e888c29..6121c80 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -744,6 +744,16 @@ config OF_LIBFDT_OVERLAY
        help
          This enables the FDT library (libfdt) overlay support.
 
+config SYS_FDT_PAD
+       hex "Maximum size of the FDT memory area passeed to the OS"
+       depends on OF_LIBFDT
+       default 0x13000 if FMAN_ENET || QE || U_QE
+       default 0x3000
+       help
+         During OS boot, we allocate a region of memory within the bootmap
+         for the FDT. This is the size that we will expand the FDT that we
+         are using will be extended to be, in bytes.
+
 config SPL_OF_LIBFDT
        bool "Enable the FDT library for SPL"
        depends on SPL_LIBGENERIC_SUPPORT