malloc_f: enable SYS_MALLOC_F by default if DM is on

This option has a bool type, not hex.
Fix it and enable it if CONFIG_DM is on because Driver Model always
requires malloc memory.  Devices are scanned twice, before/after
relocation.  CONFIG_SYS_MALLOC_F should be enabled to use malloc
memory before relocation.  As it is board-independent, handle it
globally.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Robert Baldyga <r.baldyga@samsung.com>

diff --git a/Kconfig b/Kconfig
index 612fc9279e481819bdb02aa1ee6a5e7dc1c6e00a..948136c75ea4cba48299c3080ad9e39058b8d41a 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -54,7 +54,7 @@ config CC_OPTIMIZE_FOR_SIZE
 
 config SYS_MALLOC_F
        bool "Enable malloc() pool before relocation"
 
 config SYS_MALLOC_F
        bool "Enable malloc() pool before relocation"

-       default 0x400
+       default y if DM

        help
          Before relocation memory is very limited on many platforms. Still,
          we can provide a small malloc() pool if needed. Driver model in
        help
          Before relocation memory is very limited on many platforms. Still,
          we can provide a small malloc() pool if needed. Driver model in

diff --git a/arch/arm/cpu/armv7/exynos/Kconfig b/arch/arm/cpu/armv7/exynos/Kconfig
index 9e47ed3ed78a63ab422160d58b1082d9a6bca748..bd7540ac61cc1648f75b8e5f0ca937423628fa4f 100644 (file)
--- a/arch/arm/cpu/armv7/exynos/Kconfig
+++ b/arch/arm/cpu/armv7/exynos/Kconfig
@@ -80,9 +80,6 @@ config DM_SPI_FLASH
 config DM_GPIO
        default y
 
 config DM_GPIO
        default y
 

-config SYS_MALLOC_F
-       default y
-

 source "board/samsung/smdkv310/Kconfig"
 source "board/samsung/trats/Kconfig"
 source "board/samsung/universal_c210/Kconfig"
 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 aa2ff46630dd0734a4a18ff4c72873f3296a61e3..1f96498fb87ac4fe6f5b6d710b7c4dda77195876 100644 (file)
--- a/arch/arm/cpu/armv7/omap3/Kconfig
+++ b/arch/arm/cpu/armv7/omap3/Kconfig
@@ -106,9 +106,6 @@ config DM_GPIO
 config DM_SERIAL
        default y if DM
 
 config DM_SERIAL
        default y if DM
 

-config SYS_MALLOC_F
-       default y if DM
-

 config SYS_SOC
        default "omap3"
 
 config SYS_SOC
        default "omap3"
 

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index fccfd79648ac19139c2f6c46db50b5fbdd0b50ff..fce1c1dc8785af397376cd2005f986fdb2bfff37 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -17,9 +17,6 @@ config TEGRA124
 
 endchoice
 
 
 endchoice
 

-config SYS_MALLOC_F
-       default y
-

 config SYS_MALLOC_F_LEN
        default 0x1800
 
 config SYS_MALLOC_F_LEN
        default 0x1800
 

diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 7fc26dd20f9aa852e06286f3c04e879e1a99e6ef..288e6aba79502575a036848b7172b6a94a892dfe 100644 (file)
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -45,9 +45,6 @@ config DCC_MICRO_SUPPORT_CARD
 
 endchoice
 
 
 endchoice
 

-config SYS_MALLOC_F
-       default y
-

 config CMD_PINMON
        bool "Enable boot mode pins monitor command"
        default y
 config CMD_PINMON
        bool "Enable boot mode pins monitor command"
        default y

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 35d24e4acaec1a1d8a72d3b7de5a0c617b4a03ef..da271158f149b14a2af3b0f424afe66ce50e824a 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -76,9 +76,6 @@ config DM_GPIO
 config DM_SERIAL
        default y
 
 config DM_SERIAL
        default y
 

-config SYS_MALLOC_F
-       default y
-

 config SYS_MALLOC_F_LEN
        default 0x800
 
 config SYS_MALLOC_F_LEN
        default 0x800
 

diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig
index c0dbd1829bbb61c9560a910b3b9f630ff407b274..46efa7a79f17965702364c715ad0af463349403a 100644 (file)
--- a/board/amcc/canyonlands/Kconfig
+++ b/board/amcc/canyonlands/Kconfig
@@ -39,8 +39,4 @@ config DM
 config DM_SERIAL
        default y
 
 config DM_SERIAL
        default y
 

-config SYS_MALLOC_F
-       bool
-       default y
-

 endif
 endif

diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig
index 8c45892cfa18d2f9c741d3e4541080159bf13566..7cb006f99c617be291f813d008663bc26ab36c6a 100644 (file)
--- a/board/ti/am335x/Kconfig
+++ b/board/ti/am335x/Kconfig
@@ -47,7 +47,4 @@ config DM_GPIO
 config DM_SERIAL
        default y if DM
 
 config DM_SERIAL
        default y if DM
 

-config SYS_MALLOC_F
-       default y if DM
-

 endif
 endif

diff --git a/configs/Linksprite_pcDuino3_fdt_defconfig b/configs/Linksprite_pcDuino3_fdt_defconfig
index 87dd38fa9d03c8c19a2681778c267b95c697f7f5..7690d1e72238039b70370b20ebb6b839d418a7d6 100644 (file)
--- a/configs/Linksprite_pcDuino3_fdt_defconfig
+++ b/configs/Linksprite_pcDuino3_fdt_defconfig
@@ -13,4 +13,3 @@ CONFIG_MACH_SUN7I=y
 CONFIG_DRAM_CLK=480
 CONFIG_DRAM_ZQ=122
 CONFIG_DRAM_EMR1=4
 CONFIG_DRAM_CLK=480
 CONFIG_DRAM_ZQ=122
 CONFIG_DRAM_EMR1=4

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig
index a439298755fa37613037955e95308fda9441345a..7ff0a13c0be329b3b354b59d3a4269ef2fd9458a 100644 (file)
--- a/configs/am335x_igep0033_defconfig
+++ b/configs/am335x_igep0033_defconfig
@@ -3,4 +3,3 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_ARM=y
 CONFIG_TARGET_AM335X_IGEP0033=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_ARM=y
 CONFIG_TARGET_AM335X_IGEP0033=y

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 00cbdd23522625c2acc9254ad8b28ea9c4f1af64..f10a5c2c90b679364dddd6afe96bc86aeedb56c5 100644 (file)
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -5,4 +5,3 @@ CONFIG_TARGET_CM_FX6=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig
index 31705f29e92c110a55fd4f85452493f077c193bb..d189799c4b4725abb01920f1318b336a79f191fa 100644 (file)
--- a/configs/cm_t335_defconfig
+++ b/configs/cm_t335_defconfig
@@ -1,4 +1,3 @@
 CONFIG_SPL=y
 CONFIG_ARM=y
 CONFIG_TARGET_CM_T335=y
 CONFIG_SPL=y
 CONFIG_ARM=y
 CONFIG_TARGET_CM_T335=y

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig
index b3816ec3c2ac2d06feb7818106e661d6ab6d9c02..8bc5e8be8b23940237661405daf4a47689cd1dd8 100644 (file)
--- a/configs/mx6dlsabreauto_defconfig
+++ b/configs/mx6dlsabreauto_defconfig
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL"
 CONFIG_ARM=y
 CONFIG_TARGET_MX6QSABREAUTO=y
 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_DM=y
 CONFIG_DM_THERMAL=y
 CONFIG_DM=y
 CONFIG_DM_THERMAL=y

diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig
index df092967b4e9668b79f51e5d3a0fb3f973c456cf..ba9e512b4e03470b60c49aa4420e9aa14905dcbf 100644 (file)
--- a/configs/mx6qsabreauto_defconfig
+++ b/configs/mx6qsabreauto_defconfig
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q"
 CONFIG_ARM=y
 CONFIG_TARGET_MX6QSABREAUTO=y
 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_DM=y
 CONFIG_DM_THERMAL=y
 CONFIG_DM=y
 CONFIG_DM_THERMAL=y

diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index cad4281a0c993b8a46dc1fbe313605da2dc33008..1764b39207b0779ae6d2298ef958ae4913e9acb9 100644 (file)
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -1,6 +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_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_DM=y
 CONFIG_DM_THERMAL=y
 CONFIG_DM=y
 CONFIG_DM_THERMAL=y

diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig
index 12a9bdca267403704c13ce212667ad7efd12eac7..5c862cf11e59fc8f307942c12f03107538eb8451 100644 (file)
--- a/configs/mx6sxsabresd_defconfig
+++ b/configs/mx6sxsabresd_defconfig
@@ -1,6 +1,5 @@
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX"
 CONFIG_ARM=y
 CONFIG_TARGET_MX6SXSABRESD=y
 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_DM=y
 CONFIG_DM_THERMAL=y
 CONFIG_DM=y
 CONFIG_DM_THERMAL=y

diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 48a1b29bf77c3f3cd3bc6bb8cb6ae6dcb140f06a..20a51e1d2fd81478e86455b985ce20e03d0680dd 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -4,4 +4,3 @@ CONFIG_TARGET_NOKIA_RX51=y
 CONFIG_DM=n
 CONFIG_DM_SERIAL=n
 CONFIG_DM_GPIO=n
 CONFIG_DM=n
 CONFIG_DM_SERIAL=n
 CONFIG_DM_GPIO=n

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
index a8b10d4ebcd905cf9d3c78e28d496a3107fc0597..08075e7c15f6fa0c3844749d201abc7355df635f 100644 (file)
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -2,4 +2,3 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV1"
 CONFIG_ARM=y
 CONFIG_TARGET_PCM051=y
 CONFIG_SYS_EXTRA_OPTIONS="REV1"
 CONFIG_ARM=y
 CONFIG_TARGET_PCM051=y

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
index ef307d966d2eedf889ba6dda73380e4d5be70552..56deb48fb776cee6daa5ab765f8f2a991b26cd7b 100644 (file)
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -2,4 +2,3 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="REV3"
 CONFIG_ARM=y
 CONFIG_TARGET_PCM051=y
 CONFIG_SYS_EXTRA_OPTIONS="REV3"
 CONFIG_ARM=y
 CONFIG_TARGET_PCM051=y

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
index 86f8bbbf85b9b3ac9020e999baeb50d82f2fada2..6346b57809a23a36a807d8a51a204f8cf2196fa8 100644 (file)
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -1,4 +1,3 @@
 CONFIG_SPL=y
 CONFIG_ARM=y
 CONFIG_TARGET_PENGWYN=y
 CONFIG_SPL=y
 CONFIG_ARM=y
 CONFIG_TARGET_PENGWYN=y

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/pepper_defconfig b/configs/pepper_defconfig
index 438d886114116d692d429e45c1715c0a384db8b1..3b042ec1bbeb6a6ac2321c0a67f4e9150b6dfcd1 100644 (file)
--- a/configs/pepper_defconfig
+++ b/configs/pepper_defconfig
@@ -1,4 +1,3 @@
 CONFIG_SPL=y
 CONFIG_ARM=y
 CONFIG_TARGET_PEPPER=y
 CONFIG_SPL=y
 CONFIG_ARM=y
 CONFIG_TARGET_PEPPER=y

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 69723d54da3577a377295a6bd59b9d435a0b2212..3075321551c5d0a4c50b44603476e38f2aa505c5 100644 (file)
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -1,3 +1,2 @@
 CONFIG_ARM=y
 CONFIG_TARGET_RPI_2=y
 CONFIG_ARM=y
 CONFIG_TARGET_RPI_2=y

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index 1a5a8e2fc84ddda5bf2934817c2e5ef6bd43ff00..9379cf00d444cdc3cd00b4d51ee08c8f09e27b96 100644 (file)
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -1,3 +1,2 @@
 CONFIG_ARM=y
 CONFIG_TARGET_RPI=y
 CONFIG_ARM=y
 CONFIG_TARGET_RPI=y

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig
index 58156671ca62985a41ac805e9112d7ba533f9fcd..618e59080255dfded21fa4120bded96546cb2d87 100644 (file)
--- a/configs/s5p_goni_defconfig
+++ b/configs/s5p_goni_defconfig
@@ -2,4 +2,3 @@ CONFIG_ARM=y
 CONFIG_ARCH_S5PC1XX=y
 CONFIG_TARGET_S5P_GONI=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"
 CONFIG_ARCH_S5PC1XX=y
 CONFIG_TARGET_S5P_GONI=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni"

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index a0e19addd1aed2558e3038639027060175747238..a216039ab28e3b5772ff049e880247035022ad21 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -5,7 +5,6 @@ CONFIG_FIT_VERBOSE=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_DM=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_FIT_SIGNATURE=y
 CONFIG_DM=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"

-CONFIG_SYS_MALLOC_F=y

 CONFIG_CROS_EC=y
 CONFIG_DM_CROS_EC=y
 CONFIG_CROS_EC_SANDBOX=y
 CONFIG_CROS_EC=y
 CONFIG_DM_CROS_EC=y
 CONFIG_CROS_EC_SANDBOX=y

diff --git a/configs/smdkc100_defconfig b/configs/smdkc100_defconfig
index 585fea6b780718ee38ff057f10e93c581b1f0b61..041030f942f8e7a69e8d8096076f47c505d1e0e3 100644 (file)
--- a/configs/smdkc100_defconfig
+++ b/configs/smdkc100_defconfig
@@ -2,4 +2,3 @@ CONFIG_ARM=y
 CONFIG_TARGET_SMDKC100=y
 CONFIG_ARCH_S5PC1XX=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"
 CONFIG_TARGET_SMDKC100=y
 CONFIG_ARCH_S5PC1XX=y
 CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100"

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index 9a0d0ad869834216f1e644797d3f2baf9352805e..576d9c51aad9a66df643cf296abb7db3ad271bcb 100644 (file)
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -5,4 +5,3 @@ CONFIG_TARGET_SNAPPER9260=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig
index 82f7a07750d3f956a26da12377cfada4e0eeb9d0..07a26434dc2aac19e3f557a39b3126550dd2106f 100644 (file)
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -5,4 +5,3 @@ CONFIG_TARGET_SNAPPER9260=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y
 CONFIG_DM=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_SERIAL=y

-CONFIG_SYS_MALLOC_F=y

diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig
index 1c9ba881a4a431006624ecdd5b73c4f0c12b89e6..e8cf311eb509940e7861f7e906ba9abd24239452 100644 (file)
--- a/configs/stv0991_defconfig
+++ b/configs/stv0991_defconfig
@@ -1,7 +1,6 @@
 CONFIG_SYS_EXTRA_OPTIONS="stv0991"
 CONFIG_ARM=y
 CONFIG_TARGET_STV0991=y
 CONFIG_SYS_EXTRA_OPTIONS="stv0991"
 CONFIG_ARM=y
 CONFIG_TARGET_STV0991=y

-CONFIG_SYS_MALLOC_F=y

 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DM=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DM=y
 CONFIG_DM_SERIAL=y

diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index e9ef7cc980277e494de39a535857a46516ad46b4..c33f1cb88074aa3d9efbfcd418eaa83da111e59c 100644 (file)
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -35,8 +35,6 @@
 #define CONFIG_SYS_THUMB_BUILD
 #define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_THUMB_BUILD
 #define CONFIG_SYS_GENERIC_BOARD
 

-#define CONFIG_SYS_MALLOC_F_LEN        (1 << 10)
-

 /* Support File sytems */
 #define CONFIG_FAT_WRITE
 #define CONFIG_DOS_PARTITION
 /* Support File sytems */
 #define CONFIG_FAT_WRITE
 #define CONFIG_DOS_PARTITION