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 5e5b24674d376de931fe98045e9c17d1478b7c82..e75d051c8721ce0c642ac613d90761a968e704fa 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 1ba48e587215c23746acc3f747dddef4eab8c987..11a3db590259d0220d07447b2e15887fd92058b3 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 f5e07a929fc59384d430cfac31d5dc36086885cb..a5461d7fc6853a7398d6320348c061ef9fa6d303 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 7983a71953d47cffc088fba1c7f8c4e3acf6004a..560083c5b315c14778880837ceca9cb998e7b5e9 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 9d43d87338a99384c2ae52391dd74360f08d2056..fc068c94a9ea61126971c720afee58bbf90f4a5b 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 9a9920a8805562cfb7221f9e6375fef2ee5b9089..056e2d1925ba517efac910fe440fde11df3fff08 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 4280c2df1fabe34840af168ef0d1ee3151a6bb03..bba82f1e0cd3c0399d428add5cfb4f38405287e1 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 5f3fd89c21bb33a4608dc45aa67300c9fb8aecc4..7e65b2b6aa226e03eabd00f35b882cc5e8ac052c 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 589ba615dd6ddbdd80fa58bc6fa6ac9cd38e34d0..0d470c4b4a1378b83d31a89fce61474be9d63614 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 43f30fd70f7183655477f41fc8f4929da4e7d867..1fb1d05eba36eb1daa437d8951499dc3bd36e4ce 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 2e48ea0f8aadfee270f8f10c71e9dc7932d7f3b7..e5fb111f1b883db08b1a168f87ddb8dd04b7fe7f 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 e888c29245ed61bd6e2b3d897db6571ca1467611..6121c80dc818da621d37850e46e70872bfe3abfe 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