Change the #ifdef so that the early malloc() area is not set up in SPL if CONFIG_SYS_SPL_MALLOC_START is defined. In that case it would never actually be used, and just chews up stack space.
Signed-off-by: Simon Glass sjg@chromium.org Tested-by: Masahiro Yamada yamada.masahiro@socionext.com ---
Changes in v3: None Changes in v2: None
common/init/board_init.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/common/init/board_init.c b/common/init/board_init.c index c113a80..040baca 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -50,7 +50,8 @@ ulong board_init_f_mem(ulong top) #endif arch_setup_gd(gd_ptr);
-#if defined(CONFIG_SYS_MALLOC_F) +#if defined(CONFIG_SYS_MALLOC_F) && \ + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START)) top -= CONFIG_SYS_MALLOC_F_LEN; gd->malloc_base = top; #endif