leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase default of CONFIG_SYS_MALLOC_F_LEN for SPL_OF_CONTROL

Browse Source 
If both SPL_DM and SPL_OF_CONTROL are enabled, SPL needs to bind
several devices, but CONFIG_SYS_MALLOC_F_LEN=0x400 is apparently
not enough.  Increase the default to 0x2000 for the case.  This
will be helpful for shorter defconfigs.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Stefan Roese <sr@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masahiro Yamada 2016-08-30 18:50:36 +09:00 committed by Tom Rini
parent 1544698816
commit 90c08d9e08
25 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Kconfig
View File

@ -83,6 +83,7 @@ config SYS_MALLOC_F
config SYS_MALLOC_F_LEN config SYS_MALLOC_F_LEN
hex "Size of malloc() pool before relocation" hex "Size of malloc() pool before relocation"
depends on SYS_MALLOC_F depends on SYS_MALLOC_F
default 0x2000 if SPL_DM && SPL_OF_CONTROL
default 0x400 default 0x400
help help
Before relocation, memory is very limited on many platforms. Still, Before relocation, memory is very limited on many platforms. Still,

1
configs/clearfog_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MVEBU=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_CLEARFOG=y CONFIG_TARGET_CLEARFOG=y
CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog" CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog"
CONFIG_SPL=y CONFIG_SPL=y

1
configs/db-88f6720_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MVEBU=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_DB_88F6720=y CONFIG_TARGET_DB_88F6720=y
CONFIG_DEFAULT_DEVICE_TREE="armada-375-db" CONFIG_DEFAULT_DEVICE_TREE="armada-375-db"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set

1
configs/db-88f6820-gp_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MVEBU=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_DB_88F6820_GP=y CONFIG_TARGET_DB_88F6820_GP=y
CONFIG_DEFAULT_DEVICE_TREE="armada-388-gp" CONFIG_DEFAULT_DEVICE_TREE="armada-388-gp"
CONFIG_SPL=y CONFIG_SPL=y

1
configs/db-mv784mp-gp_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MVEBU=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_DB_MV784MP_GP=y CONFIG_TARGET_DB_MV784MP_GP=y
CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp" CONFIG_DEFAULT_DEVICE_TREE="armada-xp-gp"
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set

1
configs/ds414_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MVEBU=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_DS414=y CONFIG_TARGET_DS414=y
CONFIG_DEFAULT_DEVICE_TREE="armada-xp-synology-ds414" CONFIG_DEFAULT_DEVICE_TREE="armada-xp-synology-ds414"
CONFIG_SPL=y CONFIG_SPL=y

1
configs/maxbcm_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MVEBU=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_MAXBCM=y CONFIG_TARGET_MAXBCM=y
CONFIG_DEFAULT_DEVICE_TREE="armada-xp-maxbcm" CONFIG_DEFAULT_DEVICE_TREE="armada-xp-maxbcm"
CONFIG_SPL=y CONFIG_SPL=y

1
configs/sandbox_spl_defconfig
View File

@ -1,4 +1,3 @@
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_SANDBOX_SPL=y CONFIG_SANDBOX_SPL=y
CONFIG_PCI=y CONFIG_PCI=y

1
configs/socfpga_arria5_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SOCFPGA=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/socfpga_cyclone5_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SOCFPGA=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/socfpga_de0_nano_soc_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SOCFPGA=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/socfpga_is1_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SOCFPGA=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_TARGET_SOCFPGA_IS1=y CONFIG_TARGET_SOCFPGA_IS1=y

1
configs/socfpga_mcvevk_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SOCFPGA=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/socfpga_sockit_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SOCFPGA=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/socfpga_socrates_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SOCFPGA=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/socfpga_sr1500_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SOCFPGA=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/socfpga_vining_fpga_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y CONFIG_ARCH_SOCFPGA=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_DM=y CONFIG_SPL_DM=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y

1
configs/theadorable_debug_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MVEBU=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_THEADORABLE=y CONFIG_TARGET_THEADORABLE=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable" CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"

1
configs/theadorable_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MVEBU=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_TARGET_THEADORABLE=y CONFIG_TARGET_THEADORABLE=y
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable" CONFIG_DEFAULT_DEVICE_TREE="armada-xp-theadorable"

1
configs/uniphier_ld11_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_UNIPHIER=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ARCH_UNIPHIER_LD11=y CONFIG_ARCH_UNIPHIER_LD11=y
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000

1
configs/uniphier_ld20_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_UNIPHIER=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ARCH_UNIPHIER_LD20=y CONFIG_ARCH_UNIPHIER_LD20=y
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000

1
configs/uniphier_ld4_sld8_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_UNIPHIER=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ARCH_UNIPHIER_LD4_SLD8=y CONFIG_ARCH_UNIPHIER_LD4_SLD8=y
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000

1
configs/uniphier_pro4_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_UNIPHIER=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref" CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref"

1
configs/uniphier_pxs2_ld6b_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_UNIPHIER=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000

1
configs/uniphier_sld3_defconfig
View File

@ -1,6 +1,5 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_UNIPHIER=y
CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ARCH_UNIPHIER_SLD3=y CONFIG_ARCH_UNIPHIER_SLD3=y
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000