diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-03-19 19:42:55 +0900 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-03-28 09:03:09 -0400 |
commit | 326a682358c16afcf2c7a9617e9811e72a1f0929 (patch) | |
tree | ace15e23b53dad25225f15f46b5bb3ab4561b30b /configs | |
parent | 91405b7fa9a7e53f238d55a17730933f43871fc1 (diff) |
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>
Diffstat (limited to 'configs')
-rw-r--r-- | configs/Linksprite_pcDuino3_fdt_defconfig | 1 | ||||
-rw-r--r-- | configs/am335x_igep0033_defconfig | 1 | ||||
-rw-r--r-- | configs/cm_fx6_defconfig | 1 | ||||
-rw-r--r-- | configs/cm_t335_defconfig | 1 | ||||
-rw-r--r-- | configs/mx6dlsabreauto_defconfig | 1 | ||||
-rw-r--r-- | configs/mx6qsabreauto_defconfig | 1 | ||||
-rw-r--r-- | configs/mx6qsabresd_defconfig | 1 | ||||
-rw-r--r-- | configs/mx6sxsabresd_defconfig | 1 | ||||
-rw-r--r-- | configs/nokia_rx51_defconfig | 1 | ||||
-rw-r--r-- | configs/pcm051_rev1_defconfig | 1 | ||||
-rw-r--r-- | configs/pcm051_rev3_defconfig | 1 | ||||
-rw-r--r-- | configs/pengwyn_defconfig | 1 | ||||
-rw-r--r-- | configs/pepper_defconfig | 1 | ||||
-rw-r--r-- | configs/rpi_2_defconfig | 1 | ||||
-rw-r--r-- | configs/rpi_defconfig | 1 | ||||
-rw-r--r-- | configs/s5p_goni_defconfig | 1 | ||||
-rw-r--r-- | configs/sandbox_defconfig | 1 | ||||
-rw-r--r-- | configs/smdkc100_defconfig | 1 | ||||
-rw-r--r-- | configs/snapper9260_defconfig | 1 | ||||
-rw-r--r-- | configs/snapper9g20_defconfig | 1 | ||||
-rw-r--r-- | configs/stv0991_defconfig | 1 |
21 files changed, 0 insertions, 21 deletions
diff --git a/configs/Linksprite_pcDuino3_fdt_defconfig b/configs/Linksprite_pcDuino3_fdt_defconfig index 87dd38fa9d..7690d1e722 100644 --- 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_SYS_MALLOC_F=y diff --git a/configs/am335x_igep0033_defconfig b/configs/am335x_igep0033_defconfig index a439298755..7ff0a13c0b 100644 --- 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_SYS_MALLOC_F=y diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 00cbdd2352..f10a5c2c90 100644 --- 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_SYS_MALLOC_F=y diff --git a/configs/cm_t335_defconfig b/configs/cm_t335_defconfig index 31705f29e9..d189799c4b 100644 --- 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_SYS_MALLOC_F=y diff --git a/configs/mx6dlsabreauto_defconfig b/configs/mx6dlsabreauto_defconfig index b3816ec3c2..8bc5e8be8b 100644 --- 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_MALLOC_F=y CONFIG_DM=y CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabreauto_defconfig b/configs/mx6qsabreauto_defconfig index df092967b4..ba9e512b4e 100644 --- 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_MALLOC_F=y CONFIG_DM=y CONFIG_DM_THERMAL=y diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig index cad4281a0c..1764b39207 100644 --- 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_MALLOC_F=y CONFIG_DM=y CONFIG_DM_THERMAL=y diff --git a/configs/mx6sxsabresd_defconfig b/configs/mx6sxsabresd_defconfig index 12a9bdca26..5c862cf11e 100644 --- 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_MALLOC_F=y CONFIG_DM=y CONFIG_DM_THERMAL=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 48a1b29bf7..20a51e1d2f 100644 --- 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_SYS_MALLOC_F=y diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index a8b10d4ebc..08075e7c15 100644 --- 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_MALLOC_F=y diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index ef307d966d..56deb48fb7 100644 --- 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_MALLOC_F=y diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 86f8bbbf85..6346b57809 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -1,4 +1,3 @@ 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 438d886114..3b042ec1bb 100644 --- a/configs/pepper_defconfig +++ b/configs/pepper_defconfig @@ -1,4 +1,3 @@ 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 69723d54da..3075321551 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -1,3 +1,2 @@ CONFIG_ARM=y CONFIG_TARGET_RPI_2=y -CONFIG_SYS_MALLOC_F=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index 1a5a8e2fc8..9379cf00d4 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -1,3 +1,2 @@ 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 58156671ca..618e590802 100644 --- 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_SYS_MALLOC_F=y diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig index a0e19addd1..a216039ab2 100644 --- 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_SYS_MALLOC_F=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 585fea6b78..041030f942 100644 --- 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_SYS_MALLOC_F=y diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig index 9a0d0ad869..576d9c51aa 100644 --- 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_SYS_MALLOC_F=y diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig index 82f7a07750..07a26434dc 100644 --- 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_SYS_MALLOC_F=y diff --git a/configs/stv0991_defconfig b/configs/stv0991_defconfig index 1c9ba881a4..e8cf311eb5 100644 --- 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_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DM=y CONFIG_DM_SERIAL=y |