Commit
321f86e18d6aae9f7b7ba3ef1eb0cec769481874
Committed by
Tom Rini
2015-04-09 06:41:38 +0800
Exists in
v2017.01-smarct4x
and in
37 other branches
8qm-imx_v2020.04_5.4.70_2.3.0 , emb_lf_v2022.04 , imx_v2015.04_4.1.15_1.0.0_ga , 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_v2015.04_4.1.15_1.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-m6.0.1_2.1.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 , ti-u-boot-2015.07 , v2015.07-smarct33 , v2015.07-smarct33-emmc , v2015.07-smarct4x , v2016.05-dlt , v2016.05-smarct3x , v2016.05-smarct3x-emmc , v2016.05-smarct4x , v2017.01-smarct3x , v2017.01-smarct3x-emmc
ARM: zynq: disable CONFIG_SYS_MALLOC_F to fix MMC boot
Since commit 326a682358c1 (malloc_f: enable SYS_MALLOC_F by default
if DM is on), Zynq MMC boot hangs up after printing the following:
U-Boot SPL 2015.04-rc5-00053-gadcc570 (Apr 08 2015 - 12:59:11)
mmc boot
reading system.dtb
Prior to commit 326a682358c1 , Zynq boards enabled CONFIG_DM, but
not CONFIG_SYS_MALLOC_F. That commit forcibly turned on
CONFIG_SYS_MALLOC_F. I have not figured out the root cause, but
anyway it looks like CONFIG_SYS_MALLOC_F gave a bad impact on the
Zynq MMC boot.
We are planning to have the v2015.04 release in a few days.
I know this is a defensive fixup, but what I can do now is to add
# CONFIG_SYS_MALLOC_F is not set
to every Zynq defconfig file to get back the original behavior.
Tested on:
- Zedboard
- ZC706 board
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Cc: Simon Glass <sjg@chromium.org>
Showing
7 changed files
with
7 additions
and
0 deletions
Side-by-side Diff
...
...
@@ -3,6 +3,7 @@
3
3
CONFIG_ZYNQ=y
4
4
CONFIG_TARGET_ZYNQ_MICROZED=y
5
5
CONFIG_OF_CONTROL=y
6
+# CONFIG_SYS_MALLOC_F is not set
6
7
CONFIG_FIT=y
7
8
CONFIG_FIT_VERBOSE=y
8
9
CONFIG_FIT_SIGNATURE=y
...
...
@@ -4,6 +4,7 @@
4
4
CONFIG_TARGET_ZYNQ_ZC70X=y
5
5
CONFIG_OF_CONTROL=y
6
6
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
7
+# CONFIG_SYS_MALLOC_F is not set
7
8
CONFIG_FIT=y
8
9
CONFIG_FIT_VERBOSE=y
9
10
CONFIG_FIT_SIGNATURE=y
...
...
@@ -5,6 +5,7 @@
5
5
CONFIG_TARGET_ZYNQ_ZC770=y
6
6
CONFIG_OF_CONTROL=y
7
7
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
8
+# CONFIG_SYS_MALLOC_F is not set
8
9
CONFIG_FIT=y
9
10
CONFIG_FIT_VERBOSE=y
10
11
CONFIG_FIT_SIGNATURE=y
...
...
@@ -5,6 +5,7 @@
5
5
CONFIG_TARGET_ZYNQ_ZC770=y
6
6
CONFIG_OF_CONTROL=y
7
7
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm012"
8
+# CONFIG_SYS_MALLOC_F is not set
8
9
CONFIG_FIT=y
9
10
CONFIG_FIT_VERBOSE=y
10
11
CONFIG_FIT_SIGNATURE=y
...
...
@@ -5,6 +5,7 @@
5
5
CONFIG_TARGET_ZYNQ_ZC770=y
6
6
CONFIG_OF_CONTROL=y
7
7
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm013"
8
+# CONFIG_SYS_MALLOC_F is not set
8
9
CONFIG_FIT=y
9
10
CONFIG_FIT_VERBOSE=y
10
11
CONFIG_FIT_SIGNATURE=y
...
...
@@ -4,6 +4,7 @@
4
4
CONFIG_TARGET_ZYNQ_ZED=y
5
5
CONFIG_OF_CONTROL=y
6
6
CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
7
+# CONFIG_SYS_MALLOC_F is not set
7
8
CONFIG_FIT=y
8
9
CONFIG_FIT_VERBOSE=y
9
10
CONFIG_FIT_SIGNATURE=y
...
...
@@ -4,6 +4,7 @@
4
4
CONFIG_TARGET_ZYNQ_ZYBO=y
5
5
CONFIG_OF_CONTROL=y
6
6
CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo"
7
+# CONFIG_SYS_MALLOC_F is not set
7
8
CONFIG_FIT=y
8
9
CONFIG_FIT_VERBOSE=y
9
10
CONFIG_FIT_SIGNATURE=y
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0
mentioned in commit 5553f0