Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5553f000fc7820c0b0fea0dabf9b4dc1cf7099d4

Authored by Simon Glass
Committed by Tom Rini
1 parent 5fa030b9f0
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.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-rel_imx_4.1.15_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, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

Revert "ARM: zynq: disable CONFIG_SYS_MALLOC_F to fix MMC boot" 

This reverts commit 321f86e18d6aae9f7b7ba3ef1eb0cec769481874.

The original bug has been fixed.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-on: Zedboard and ZC706 board
Tested-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-on: zc702
Tested-by: Michal Simek <michal.simek@xilinx.com>

Showing 10 changed files with 0 additions and 10 deletions Side-by-side Diff

configs/zynq_microzed_defconfig
Diff comments   View file @ 5553f00
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3   -# CONFIG_SYS_MALLOC_F is not set
4 3 CONFIG_TARGET_ZYNQ_MICROZED=y
5 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
6 5 CONFIG_SPL=y
configs/zynq_zc702_defconfig
Diff comments   View file @ 5553f00
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3   -# CONFIG_SYS_MALLOC_F is not set
4 3 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
5 4 CONFIG_SPL=y
6 5 CONFIG_FIT=y
configs/zynq_zc706_defconfig
Diff comments   View file @ 5553f00
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3   -# CONFIG_SYS_MALLOC_F is not set
4 3 CONFIG_TARGET_ZYNQ_ZC706=y
5 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706"
6 5 CONFIG_SPL=y
configs/zynq_zc70x_defconfig
Diff comments   View file @ 5553f00
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3   -# CONFIG_SYS_MALLOC_F is not set
4 3 CONFIG_TARGET_ZYNQ_ZC70X=y
5 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
6 5 CONFIG_SPL=y
configs/zynq_zc770_xm010_defconfig
Diff comments   View file @ 5553f00
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3   -# CONFIG_SYS_MALLOC_F is not set
4 3 CONFIG_TARGET_ZYNQ_ZC770=y
5 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
6 5 CONFIG_SPL=y
configs/zynq_zc770_xm011_defconfig
Diff comments   View file @ 5553f00
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3   -# CONFIG_SYS_MALLOC_F is not set
4 3 CONFIG_TARGET_ZYNQ_ZC770=y
5 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm011"
6 5 CONFIG_SPL=y
configs/zynq_zc770_xm012_defconfig
Diff comments   View file @ 5553f00
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3   -# CONFIG_SYS_MALLOC_F is not set
4 3 CONFIG_TARGET_ZYNQ_ZC770=y
5 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
6 5 CONFIG_SPL=y
configs/zynq_zc770_xm013_defconfig
Diff comments   View file @ 5553f00
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3   -# CONFIG_SYS_MALLOC_F is not set
4 3 CONFIG_TARGET_ZYNQ_ZC770=y
5 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
6 5 CONFIG_SPL=y
configs/zynq_zed_defconfig
Diff comments   View file @ 5553f00
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3   -# CONFIG_SYS_MALLOC_F is not set
4 3 CONFIG_TARGET_ZYNQ_ZED=y
5 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
6 5 CONFIG_SPL=y
configs/zynq_zybo_defconfig
Diff comments   View file @ 5553f00
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_ZYNQ=y
3   -# CONFIG_SYS_MALLOC_F is not set
4 3 CONFIG_TARGET_ZYNQ_ZYBO=y
5 4 CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
6 5 CONFIG_SPL=y