dm: Kconfig: Move CONFIG_SYS_MALLOC_F_LEN to Kconfig

Move this option to Kconfig and update all boards.
Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/Kconfig b/Kconfig
index 6112a7778e1130d1a3c8f4f2e8625d558a51c549..75bab7f6cc05af4698adf0d6866cc9aaa27a7a56 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -56,6 +56,25 @@ config CC_OPTIMIZE_FOR_SIZE
 
          This option is enabled by default for U-Boot.
 
+config SYS_MALLOC_F
+       bool "Enable malloc() pool before relocation"
+       default 0x400
+       help
+         Before relocation memory is very limited on many platforms. Still,
+         we can provide a small malloc() pool if needed. Driver model in
+         particular needs this to operate, so that it can allocate the
+         initial serial device and any others that are needed.
+
+config SYS_MALLOC_F_LEN
+       hex "Size of malloc() pool before relocation"
+       depends on SYS_MALLOC_F
+       default 0x400
+       help
+         Before relocation memory is very limited on many platforms. Still,
+         we can provide a small malloc() pool if needed. Driver model in
+         particular needs this to operate, so that it can allocate the
+         initial serial device and any others that are needed.
+
 menuconfig EXPERT
         bool "Configure standard U-Boot features (expert users)"
         help

diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
index 17ad567c190d96ff909fafa06e7ba57a9a497107..2064efa761991b89488219b54019cefdd99064f7 100644 (file)
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -80,6 +80,12 @@ config DM_SPI_FLASH
 config DM_GPIO
        default y if !SPL_BUILD
 
+config SYS_MALLOC_F
+       default y if !SPL_BUILD
+
+config SYS_MALLOC_F_LEN
+       default 0x400 if !SPL_BUILD
+
 source "board/samsung/smdkv310/Kconfig"
 source "board/samsung/trats/Kconfig"
 source "board/samsung/universal_c210/Kconfig"

diff --git a/arch/arm/cpu/armv7/omap3/Kconfig b/arch/arm/cpu/armv7/omap3/Kconfig
index 2fe323230fed032eb74fccbd9e560b75cf550dd2..46440981b3744e315a2f424fb7ebb75ca485bb4d 100644 (file)
--- a/arch/arm/cpu/armv7/omap3/Kconfig
+++ b/arch/arm/cpu/armv7/omap3/Kconfig
@@ -102,6 +102,12 @@ config DM_GPIO
 config DM_SERIAL
        default y if DM && !SPL_BUILD
 
+config SYS_MALLOC_F
+       default y if DM && !SPL_BUILD
+
+config SYS_MALLOC_F_LEN
+       default 0x400 if DM && !SPL_BUILD
+
 config SYS_SOC
        default "omap3"
 

diff --git a/arch/arm/cpu/armv7/tegra-common/Kconfig b/arch/arm/cpu/armv7/tegra-common/Kconfig
index 93dc7320c99f9a78d0ad53e86633f161b51add2c..ee3246929a34222dd14a2a3ff504806871d85c73 100644 (file)
--- a/arch/arm/cpu/armv7/tegra-common/Kconfig
+++ b/arch/arm/cpu/armv7/tegra-common/Kconfig
@@ -17,6 +17,12 @@ config TEGRA124
 
 endchoice
 
+config SYS_MALLOC_F
+       default y
+
+config SYS_MALLOC_F_LEN
+       default 0x1800
+
 config USE_PRIVATE_LIBGCC
        default y if SPL_BUILD
 

diff --git a/arch/arm/cpu/armv7/uniphier/Kconfig b/arch/arm/cpu/armv7/uniphier/Kconfig
index 5c5a84fe56c4fc0da0f68f8cc028fa672ed90a01..1a47ac90290940a8c301d262686843e33c85f660 100644 (file)
--- a/arch/arm/cpu/armv7/uniphier/Kconfig
+++ b/arch/arm/cpu/armv7/uniphier/Kconfig
@@ -48,6 +48,12 @@ config DCC_MICRO_SUPPORT_CARD
 
 endchoice
 
+config SYS_MALLOC_F
+       default y
+
+config SYS_MALLOC_F_LEN
+       default 0x2000
+
 config CMD_PINMON
        bool "Enable boot mode pins monitor command"
        default y

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index bb3ff4393eaadc44c3f2f52c53a1924794711dde..35d24e4acaec1a1d8a72d3b7de5a0c617b4a03ef 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -76,6 +76,12 @@ config DM_GPIO
 config DM_SERIAL
        default y
 
+config SYS_MALLOC_F
+       default y
+
+config SYS_MALLOC_F_LEN
+       default 0x800
+
 config RAMBASE
        hex
        default 0x100000

diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig
index d6581ac46879c62f78c7e377c9c14f2084143b37..a20e0c1ab9545874199d4fb2262289cb6f30a26c 100644 (file)
--- a/board/ti/am335x/Kconfig
+++ b/board/ti/am335x/Kconfig
@@ -47,4 +47,10 @@ config DM_GPIO
 config DM_SERIAL
        default y if DM && !SPL_BUILD
 
+config SYS_MALLOC_F
+       default y if DM && !SPL_BUILD
+
+config SYS_MALLOC_F_LEN
+       default 0x400 if DM && !SPL_BUILD
+
 endif

diff --git a/configs/Linksprite_pcDuino3_fdt_defconfig b/configs/Linksprite_pcDuino3_fdt_defconfig
index cfed375fc2cda077db0861cd9889770a9de40f78..1e749cded15364fa0939df3dc6fd85bf00330ad5 100644 (file)
--- a/configs/Linksprite_pcDuino3_fdt_defconfig
+++ b/configs/Linksprite_pcDuino3_fdt_defconfig
@@ -13,3 +13,5 @@ CONFIG_OF_SEPARATE=y
 +S:CONFIG_DRAM_CLK=480
 +S:CONFIG_DRAM_ZQ=122
 +S:CONFIG_DRAM_EMR1=4
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig
index 23f0a32d635570cb962cb5071ae9b7184162bde1..f3544b5238fa00d50a08e7ce6fcfb5960a813465 100644 (file)
--- a/configs/am335x_igep0033_defconfig
+++ b/configs/am335x_igep0033_defconfig
@@ -1,3 +1,5 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_AM335X_IGEP0033=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index d2ebf692f36af67a4347a715fe13fd703e3ae91f..631698c95dd4e50cf8efabb1e135b661d53b0e24 100644 (file)
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -5,3 +5,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
index 5ff4f9c4a594a16c134647a765082c787b046945..5c1d3cf3a5d1f721ffef3de8cad2d78a6bdd5793 100644 (file)
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -1,3 +1,5 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_CM_T335=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/gwventana_defconfig b/configs/gwventana_defconfig
index 4cddbdd65535657f8ca7d7d2cb41cccea0c4952f..5b1a4c4e5874b16b73d691d023ef8fa21cef7e30 100644 (file)
--- a/configs/gwventana_defconfig
+++ b/configs/gwventana_defconfig
@@ -2,3 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_GW_VENTANA=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index b649935912f4b563da3f5f2426b520bfd139f269..ccdfe31992fc14fcb26ce0197c3e163f2113557e 100644 (file)
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -1,3 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
 CONFIG_ARM=y
 CONFIG_TARGET_MX6QSABREAUTO=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index 7d86700b30a9c0055d987ac60e10c12f96aa9822..fe3d797851916e900efad866985e4ae142ad2c6e 100644 (file)
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -1,3 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
 CONFIG_ARM=y
 CONFIG_TARGET_MX6QSABREAUTO=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index 67c1b77e05d356badbc0bbfad2841b1e045678ae..09b01905e6ff391e99252168b2e4d6fa27b137b5 100644 (file)
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -1,3 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q"
 CONFIG_ARM=y
 CONFIG_TARGET_MX6SABRESD=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index f23d48f361fc8e907e10b19b8f20c76fa87b75c9..72e0f103ec070fb9b964f5ef32d0cbcedd50e09f 100644 (file)
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -1,3 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX"
 CONFIG_ARM=y
 CONFIG_TARGET_MX6SXSABRESD=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 20a51e1d2fd81478e86455b985ce20e03d0680dd..1bb7664ed7a402f534cfa6c94956a590573c0237 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_NOKIA_RX51=y
 CONFIG_DM=n
 CONFIG_DM_SERIAL=n
 CONFIG_DM_GPIO=n
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
index 8b27682997ee757ccbc0e6a2b50ea2b3b9402cb0..baa2b231b05669dbbde8935f3a40d954ffaee9c9 100644 (file)
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -2,3 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV1"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_PCM051=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
index 27ad6ff26b101a21551bf33d2fb4802acaea1847..b5c62a6a3b043882bdc1fbc9443b010aafbf2e1e 100644 (file)
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -2,3 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV3"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_PCM051=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
index 1b9aa68260c833a7564718fa30d1892441bb0675..cbdd404c70d50e456977785baaa85e055e38fe98 100644 (file)
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -1,3 +1,5 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_PENGWYN=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig
index 22c7bb4a6062c2fcee8edd54e213cb242b24374d..14266ef8750af9e0745136d5499b856689dbbe9b 100644 (file)
--- a/configs/pepper_defconfig
+++ b/configs/pepper_defconfig
@@ -1,3 +1,5 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_PEPPER=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 9379cf00d444cdc3cd00b4d51ee08c8f09e27b96..98d3199ccdf7984c866b0c27096df5a81e822b25 100644 (file)
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -1,2 +1,4 @@
 CONFIG_ARM=y
 CONFIG_TARGET_RPI=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
index 618e59080255dfded21fa4120bded96546cb2d87..33e6fb8848c2bb8b65c66f597241e49e7c5949a8 100644 (file)
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_ARCH_S5PC1XX=y
 CONFIG_TARGET_S5P_GONI=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 660063ebf333ae666ff7f1898a67d036c20909ad..0bf5ea34d0c8fa125cfaa15d18932271457cadff 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -5,3 +5,5 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_DM=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index 041030f942f8e7a69e8d8096076f47c505d1e0e3..e933a329b62e00ae9dc0fdece52bd9a9da3a9d27 100644 (file)
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -2,3 +2,5 @@ CONFIG_ARM=y
 CONFIG_TARGET_SMDKC100=y
 CONFIG_ARCH_S5PC1XX=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index 035146c65755ad625b459494024bd2560d4db856..97c49f3363a6711a992fc2e7c0ea8fcb47f0ecfe 100644 (file)
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_SNAPPER9260=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig
index 66c44ccf78aa9268e967b36f16af465802a18294..d5f1d9fa1969c0e8819e8cf854bb34f15686f7bc 100644 (file)
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -4,3 +4,5 @@ CONFIG_TARGET_SNAPPER9260=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x400

diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
index a05e9917b65ecb40a83843c16f0165172bf99072..37b10ba89390a45dcf1160212376bf2cf706fc58 100644 (file)
--- a/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@ -1,3 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="stv0991"
 CONFIG_ARM=y
 CONFIG_TARGET_STV0991=y
+CONFIG_SYS_MALLOC_F=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 40083069441a6a4ab539bba5873393df2f2e435c..4207504464d0679a0425f1a7cddfc675e86c3189 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -21,10 +21,7 @@
 #define CONFIG_MACH_TYPE               4273
 
 #ifndef CONFIG_SPL_BUILD
-
 #define CONFIG_CMD_GPIO
-
-#define CONFIG_SYS_MALLOC_F_LEN                (1 << 10)
 #endif
 
 /* Display information on boot */

diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 2c4f35af9fe3ea372ecab49cc772489e1ca83a6c..59676ae61b8f10fdc404f63a816857636afd465f 100644 (file)
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -36,7 +36,6 @@
 #define CONFIG_ENV_OVERWRITE
 
 /* Size of malloc() pool before and after relocation */
-#define CONFIG_SYS_MALLOC_F_LEN                (1 << 10)
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (80 << 20))
 
 /* select serial console configuration */

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 4f137fc96bf677f471adc0a9fe8a2fb1d2425d03..620f9501d255741c921d699713fd779a3e9b4774 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -39,7 +39,6 @@
 
 /* Size of malloc() pool */
 #define CONFIG_SYS_MALLOC_LEN          (10 * 1024 * 1024)
-#define CONFIG_SYS_MALLOC_F_LEN                (1 << 10)
 
 /* Init Functions */
 #define CONFIG_BOARD_EARLY_INIT_F

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index f0f721e9b7ef586ed0a0776167e17365529c047c..80e48d141e833d7b0f01728339ed2bdaa388737b 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -27,7 +27,6 @@
 
 #define CONFIG_DM
 #define CONFIG_DM_THERMAL
-#define CONFIG_SYS_MALLOC_F_LEN        (1 << 10)
 #define CONFIG_IMX6_THERMAL
 
 #define CONFIG_SYS_GENERIC_BOARD

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 404b922d39cfeaf7790eef60e81cfc261c100033..1005b9e6bc6b17608db78f23dc71b2b5def930bb 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -229,7 +229,6 @@
 
 #define CONFIG_DM
 #define CONFIG_DM_THERMAL
-#define CONFIG_SYS_MALLOC_F_LEN        (1 << 10)
 #define CONFIG_IMX6_THERMAL
 
 #define CONFIG_CMD_FUSE

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 6e1f501b64d6fff108efbb746a806746212b3be7..46fc91e5e197bb4428c8b75c619c84ac2e3e3a9d 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -72,7 +72,6 @@
 #define CONFIG_UBI_SIZE                        (512 << 10)
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + CONFIG_UBI_SIZE + \
                                        (128 << 10))
-#define CONFIG_SYS_MALLOC_F_LEN                (1 << 10)
 
 /*
  * Hardware drivers

diff --git a/include/configs/novena.h b/include/configs/novena.h
index ea75d2c2b97e3fe03256197cce8b6214c40d2d29..074110c93955e268adfcfefc05d7e63fdb9a1b36 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -116,7 +116,6 @@
 #define CONFIG_SYS_MEMTEST_END         0x20000000
 
 #define CONFIG_SYS_MALLOC_LEN          (64 * 1024 * 1024)
-#define CONFIG_SYS_MALLOC_F_LEN                (1 << 10)
 
 /* SPL */
 #define CONFIG_SPL_FAT_SUPPORT

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index ea19ad8d072cfdd7957f22e7af9cf3cbfea9790f..7ad8d080215d1065cf5cbcbe37c2c54f390465cb 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -46,7 +46,6 @@
                                         CONFIG_SYS_SDRAM_SIZE - \
                                         GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_MALLOC_LEN          SZ_4M
-#define CONFIG_SYS_MALLOC_F_LEN                (1 << 10)
 #define CONFIG_SYS_MEMTEST_START       0x00100000
 #define CONFIG_SYS_MEMTEST_END         0x00200000
 #define CONFIG_LOADADDR                        0x00200000

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 26167a4ece790f5d1b292b7db82c615726e2777f..8fadc682395916924bf5280d5481abeb2c1de9f8 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -40,7 +40,6 @@
 #define CONFIG_CMDLINE_EDITING
 
 /* Size of malloc() pool before and after relocation */
-#define CONFIG_SYS_MALLOC_F_LEN                (1 << 10)
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (80 << 20))
 
 /*

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index bff01708f68bbb83f0cbb0b18cec01acb1db9449..5c116508d0de2463eaa368062086d159562b7b1f 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -60,7 +60,6 @@
 /*
  * Size of malloc() pool, before and after relocation
  */
-#define CONFIG_SYS_MALLOC_F_LEN        (1 << 10)
 #define CONFIG_MALLOC_F_ADDR           0x0010000
 #define CONFIG_SYS_MALLOC_LEN          (32 << 20)      /* 32MB  */
 

diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index a7eb33ed43f4856c31f0c9f20cafa38082916353..080fc3a84599e30cbee4a292d0e7487921c4f15c 100644 (file)
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -48,9 +48,6 @@
  */
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + (1 << 20))
 
-/* Small malloc pool before relocation */
-#define CONFIG_SYS_MALLOC_F_LEN                (1 << 10)
-
 /*
  * select serial console configuration
  */

diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 712f9b74ce43e519ecaec354009bba8f30acf8b7..6c685965a2cb8b476fd990ae8cfa3dc550a63b7e 100644 (file)
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -21,7 +21,6 @@
 #define CONFIG_SYS_AT91_MAIN_CLOCK     18432000 /* External Crystal, in Hz */
 #define CONFIG_SYS_AT91_SLOW_CLOCK     32768
 #define CONFIG_SYS_GENERIC_BOARD
-#define CONFIG_SYS_MALLOC_F_LEN                (1 << 10)
 
 /* CPU */
 #define CONFIG_ARCH_CPU_INIT

diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h
index fd9bd638c65575f23913b040f60799377f4c365c..071b1c2ca79e62828f46d790210285505f45e185 100644 (file)
--- a/include/configs/stv0991.h
+++ b/include/configs/stv0991.h
@@ -28,7 +28,6 @@
        (PHYS_SDRAM_1_SIZE - CONFIG_ENV_SIZE)
 #define CONFIG_SYS_MAXARGS                     16
 #define CONFIG_SYS_MALLOC_LEN                  (CONFIG_ENV_SIZE + 16 * 1024)
-#define CONFIG_SYS_MALLOC_F_LEN                        0x2000
 
 #define CONFIG_DM
 /* serial port (PL011) configuration */

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 0c5c18cb304e381af7fbcaa46ae14f458a692828..09889eeb4433c2f923074aacac49a54ea171d092 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -29,7 +29,6 @@
 
 #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM)
 # define CONFIG_DW_SERIAL
-# define CONFIG_SYS_MALLOC_F_LEN       (1 << 10)
 #endif
 
 /*

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index ef259802525cd6987879efcc812d0d452991b365..005fc6aeb374ab63498f0e635d08bf8448289c33 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -37,7 +37,6 @@
  * Size of malloc() pool
  */
 #define CONFIG_SYS_MALLOC_LEN          (4 << 20)       /* 4MB  */
-#define CONFIG_SYS_MALLOC_F_LEN                (1 << 10)
 
 #define CONFIG_SYS_NONCACHED_MEMORY    (1 << 20)       /* 1 MiB */
 

diff --git a/include/configs/ti_am335x_common.h b/include/configs/ti_am335x_common.h
index 4ce9d49c189ca86de1eda26ead9bd24a5d971513..20a55f4aa8270c47f78879663c49e87afa8c2250 100644 (file)
--- a/include/configs/ti_am335x_common.h
+++ b/include/configs/ti_am335x_common.h
@@ -21,7 +21,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 # define CONFIG_OMAP_SERIAL
-# define CONFIG_SYS_MALLOC_F_LEN       (1 << 10)
 #endif
 
 #include <asm/arch/omap.h>

diff --git a/include/configs/ti_omap3_common.h b/include/configs/ti_omap3_common.h
index 77211de9a502c417cc8bc1962d56719a008704fe..840e108e053674088189b9ed9eda0e81d3d68b9b 100644 (file)
--- a/include/configs/ti_omap3_common.h
+++ b/include/configs/ti_omap3_common.h
@@ -20,7 +20,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 # define CONFIG_OMAP_SERIAL
-# define CONFIG_SYS_MALLOC_F_LEN       (1 << 10)
 #endif
 
 /* The chip has SDRC controller */

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 6f4ecc9b04c6d3f6e2adebbefe2059a7ef2da56f..3f738fb6420bdd14d7999d3def3619eff1da5a02 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -80,8 +80,6 @@
 #define CONFIG_SMC911X_BASE            CONFIG_SUPPORT_CARD_ETHER_BASE
 #define CONFIG_SMC911X_32_BIT
 
-#define CONFIG_SYS_MALLOC_F_LEN  0x2000
-
 /*-----------------------------------------------------------------------
  * MMU and Cache Setting
  *----------------------------------------------------------------------*/

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 277a95c199a6185009a6e7aab553b0e34c3fbd07..994874ca600a00d060b7e6710e0ea3dd2e840331 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -187,7 +187,6 @@
 #define CONFIG_SYS_STACK_SIZE                  (32 * 1024)
 #define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MALLOC_LEN                  0x200000
-#define CONFIG_SYS_MALLOC_F_LEN                        (2 << 10)
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE