321f86e18d
Since commit326a682358(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 commit326a682358, 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>
13 lines
274 B
Plaintext
13 lines
274 B
Plaintext
CONFIG_SPL=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM010"
|
|
CONFIG_ARM=y
|
|
CONFIG_ZYNQ=y
|
|
CONFIG_TARGET_ZYNQ_ZC770=y
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="zynq-zc770-xm010"
|
|
# CONFIG_SYS_MALLOC_F is not set
|
|
CONFIG_FIT=y
|
|
CONFIG_FIT_VERBOSE=y
|
|
CONFIG_FIT_SIGNATURE=y
|
|
CONFIG_DM=y
|