diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-04-08 05:25:50 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-04-08 22:41:38 (GMT) |
commit | 321f86e18d6aae9f7b7ba3ef1eb0cec769481874 (patch) | |
tree | 3154dac242bf91bf1662da33964972d1ee6b6f85 /arch/nios2 | |
parent | adcc5705991ce3162fc204da9a673d9fe2cc5bf0 (diff) | |
download | u-boot-fsl-qoriq-321f86e18d6aae9f7b7ba3ef1eb0cec769481874.tar.xz |
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 'arch/nios2')
0 files changed, 0 insertions, 0 deletions