diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-04-08 14:25:50 +0900 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-08 18:41:38 -0400 |
| commit | 321f86e18d6aae9f7b7ba3ef1eb0cec769481874 (patch) | |
| tree | 3154dac242bf91bf1662da33964972d1ee6b6f85 /configs/zynq_zybo_defconfig | |
| parent | adcc5705991ce3162fc204da9a673d9fe2cc5bf0 (diff) | |
| download | blackbird-obmc-uboot-321f86e18d6aae9f7b7ba3ef1eb0cec769481874.tar.gz blackbird-obmc-uboot-321f86e18d6aae9f7b7ba3ef1eb0cec769481874.zip | |
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>
Diffstat (limited to 'configs/zynq_zybo_defconfig')
| -rw-r--r-- | configs/zynq_zybo_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig index c9d0121afb..f1001f1162 100644 --- a/configs/zynq_zybo_defconfig +++ b/configs/zynq_zybo_defconfig @@ -4,6 +4,7 @@ CONFIG_ZYNQ=y CONFIG_TARGET_ZYNQ_ZYBO=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="zynq-zybo" +# CONFIG_SYS_MALLOC_F is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y |
