diff options
| author | Simon Glass <sjg@chromium.org> | 2015-10-19 06:49:58 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-24 13:50:35 -0400 |
| commit | 518f0bccc49e783ae6aa68af9cb3b3dcd912f2cf (patch) | |
| tree | a80994fdfea5d483c2585f77fa69fc14f3d15148 /common/init | |
| parent | 12360982fa03b8d6ff9140f05067c3a8635c3540 (diff) | |
| download | u-boot-imx-518f0bccc49e783ae6aa68af9cb3b3dcd912f2cf.zip u-boot-imx-518f0bccc49e783ae6aa68af9cb3b3dcd912f2cf.tar.gz u-boot-imx-518f0bccc49e783ae6aa68af9cb3b3dcd912f2cf.tar.bz2 | |
board_init_f_mem(): Don't create an unused early malloc() area
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>
Diffstat (limited to 'common/init')
| -rw-r--r-- | common/init/board_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/init/board_init.c b/common/init/board_init.c index 1c6126d..e74b63b 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 |