Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9b1b6d42256a4c2e59c803afdbf90d39371e61ba

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 00709f5697
Exists in v2017.01-smarct4x and in 28 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

Revert "Increase default of CONFIG_SYS_MALLOC_F_LEN for SPL_OF_CONTROL" 

This reverts commit 90c08d9e08c7a108ab904f3bbdeb558081757892.

I took a closer look at this after the commit was applied, and found
CONFIG_SYS_MALLOC_F_LEN=0x2000 was too much.  8KB memory for SPL is
actually too big for some boards.  Perhaps 0x800 is enough, but the
situation varies board by board.

Let's postpone our decision until we come up with a better idea.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

Showing 25 changed files with 24 additions and 1 deletions Side-by-side Diff

... ... @@ -83,7 +83,6 @@
83 83 config SYS_MALLOC_F_LEN
84 84 hex "Size of malloc() pool before relocation"
85 85 depends on SYS_MALLOC_F
86   - default 0x2000 if SPL_DM && SPL_OF_CONTROL
87 86 default 0x400
88 87 help
89 88 Before relocation, memory is very limited on many platforms. Still,
configs/clearfog_defconfig
Diff comments   View file @ 9b1b6d4
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_MVEBU=y
3 3 CONFIG_SPL_LIBCOMMON_SUPPORT=y
4 4 CONFIG_SPL_LIBGENERIC_SUPPORT=y
  5 +CONFIG_SYS_MALLOC_F_LEN=0x2000
5 6 CONFIG_TARGET_CLEARFOG=y
6 7 CONFIG_SPL_I2C_SUPPORT=y
7 8 CONFIG_SPL_LIBDISK_SUPPORT=y
configs/db-88f6720_defconfig
Diff comments   View file @ 9b1b6d4
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_MVEBU=y
3 3 CONFIG_SPL_LIBCOMMON_SUPPORT=y
4 4 CONFIG_SPL_LIBGENERIC_SUPPORT=y
  5 +CONFIG_SYS_MALLOC_F_LEN=0x2000
5 6 CONFIG_TARGET_DB_88F6720=y
6 7 CONFIG_SPL_I2C_SUPPORT=y
7 8 CONFIG_SPL_SERIAL_SUPPORT=y
configs/db-88f6820-gp_defconfig
Diff comments   View file @ 9b1b6d4
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_MVEBU=y
3 3 CONFIG_SPL_LIBCOMMON_SUPPORT=y
4 4 CONFIG_SPL_LIBGENERIC_SUPPORT=y
  5 +CONFIG_SYS_MALLOC_F_LEN=0x2000
5 6 CONFIG_TARGET_DB_88F6820_GP=y
6 7 CONFIG_SPL_I2C_SUPPORT=y
7 8 CONFIG_SPL_SERIAL_SUPPORT=y
configs/db-mv784mp-gp_defconfig
Diff comments   View file @ 9b1b6d4
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_MVEBU=y
3 3 CONFIG_SPL_LIBCOMMON_SUPPORT=y
4 4 CONFIG_SPL_LIBGENERIC_SUPPORT=y
  5 +CONFIG_SYS_MALLOC_F_LEN=0x2000
5 6 CONFIG_TARGET_DB_MV784MP_GP=y
6 7 CONFIG_SPL_I2C_SUPPORT=y
7 8 CONFIG_SPL_SERIAL_SUPPORT=y
configs/ds414_defconfig
Diff comments   View file @ 9b1b6d4
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_MVEBU=y
3 3 CONFIG_SPL_LIBCOMMON_SUPPORT=y
4 4 CONFIG_SPL_LIBGENERIC_SUPPORT=y
  5 +CONFIG_SYS_MALLOC_F_LEN=0x2000
5 6 CONFIG_TARGET_DS414=y
6 7 CONFIG_SPL_I2C_SUPPORT=y
7 8 CONFIG_SPL_SERIAL_SUPPORT=y
configs/maxbcm_defconfig
Diff comments   View file @ 9b1b6d4
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_MVEBU=y
3 3 CONFIG_SPL_LIBCOMMON_SUPPORT=y
4 4 CONFIG_SPL_LIBGENERIC_SUPPORT=y
  5 +CONFIG_SYS_MALLOC_F_LEN=0x2000
5 6 CONFIG_TARGET_MAXBCM=y
6 7 CONFIG_SPL_I2C_SUPPORT=y
7 8 CONFIG_SPL_SERIAL_SUPPORT=y
configs/sandbox_spl_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_SPL_LIBCOMMON_SUPPORT=y
2 2 CONFIG_SPL_LIBGENERIC_SUPPORT=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_SPL_SERIAL_SUPPORT=y
4 5 CONFIG_SPL_ENV_SUPPORT=y
5 6 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
configs/socfpga_arria5_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
4 5 CONFIG_SPL_STACK_R_ADDR=0x00800000
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
configs/socfpga_cyclone5_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
4 5 CONFIG_SPL_STACK_R_ADDR=0x00800000
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
configs/socfpga_de0_nano_soc_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
4 5 CONFIG_SPL_STACK_R_ADDR=0x00800000
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
configs/socfpga_is1_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_TARGET_SOCFPGA_IS1=y
4 5 CONFIG_SPL_STACK_R_ADDR=0x00800000
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
configs/socfpga_mcvevk_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_TARGET_SOCFPGA_DENX_MCVEVK=y
4 5 CONFIG_SPL_STACK_R_ADDR=0x00800000
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_mcvevk"
configs/socfpga_sockit_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y
4 5 CONFIG_SPL_STACK_R_ADDR=0x00800000
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
configs/socfpga_socrates_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_TARGET_SOCFPGA_EBV_SOCRATES=y
4 5 CONFIG_SPL_STACK_R_ADDR=0x00800000
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
configs/socfpga_sr1500_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_TARGET_SOCFPGA_SR1500=y
4 5 CONFIG_SPL_STACK_R_ADDR=0x00800000
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
configs/socfpga_vining_fpga_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_TARGET_SOCFPGA_SAMTEC_VINING_FPGA=y
4 5 CONFIG_SPL_STACK_R_ADDR=0x00800000
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
configs/theadorable_debug_defconfig
Diff comments   View file @ 9b1b6d4
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_MVEBU=y
3 3 CONFIG_SPL_LIBCOMMON_SUPPORT=y
4 4 CONFIG_SPL_LIBGENERIC_SUPPORT=y
  5 +CONFIG_SYS_MALLOC_F_LEN=0x2000
5 6 CONFIG_TARGET_THEADORABLE=y
6 7 CONFIG_SPL_I2C_SUPPORT=y
7 8 CONFIG_SPL_SERIAL_SUPPORT=y
configs/theadorable_defconfig
Diff comments   View file @ 9b1b6d4
... ... @@ -2,6 +2,7 @@
2 2 CONFIG_ARCH_MVEBU=y
3 3 CONFIG_SPL_LIBCOMMON_SUPPORT=y
4 4 CONFIG_SPL_LIBGENERIC_SUPPORT=y
  5 +CONFIG_SYS_MALLOC_F_LEN=0x2000
5 6 CONFIG_TARGET_THEADORABLE=y
6 7 CONFIG_SPL_I2C_SUPPORT=y
7 8 CONFIG_SPL_SERIAL_SUPPORT=y
configs/uniphier_ld11_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_ARCH_UNIPHIER_LD11=y
4 5 CONFIG_MICRO_SUPPORT_CARD=y
5 6 CONFIG_SYS_TEXT_BASE=0x84000000
configs/uniphier_ld20_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_ARCH_UNIPHIER_LD20=y
4 5 CONFIG_MICRO_SUPPORT_CARD=y
5 6 CONFIG_SYS_TEXT_BASE=0x84000000
configs/uniphier_ld4_sld8_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_ARCH_UNIPHIER_LD4_SLD8=y
4 5 CONFIG_MICRO_SUPPORT_CARD=y
5 6 CONFIG_SYS_TEXT_BASE=0x84000000
configs/uniphier_pro4_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_MICRO_SUPPORT_CARD=y
4 5 CONFIG_SYS_TEXT_BASE=0x84000000
5 6 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref"
configs/uniphier_pxs2_ld6b_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y
4 5 CONFIG_MICRO_SUPPORT_CARD=y
5 6 CONFIG_SYS_TEXT_BASE=0x84000000
configs/uniphier_sld3_defconfig
Diff comments   View file @ 9b1b6d4
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_UNIPHIER=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
3 4 CONFIG_ARCH_UNIPHIER_SLD3=y
4 5 CONFIG_MICRO_SUPPORT_CARD=y
5 6 CONFIG_SYS_TEXT_BASE=0x84000000