summaryrefslogtreecommitdiff
path: root/common/init
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-11-12 12:30:19 -0200
committerTom Rini <trini@konsulko.com>2015-11-12 20:34:07 -0500
commit9ac4fc82071ce346e3885118242ff45d22f69b82 (patch)
tree1faf780ca9c79168f1eecc7dacefed02df1900d4 /common/init
parentbc80109b117abe4ed2cd4d12c8dc188561bc298e (diff)
downloadu-boot-imx-9ac4fc82071ce346e3885118242ff45d22f69b82.zip
u-boot-imx-9ac4fc82071ce346e3885118242ff45d22f69b82.tar.gz
u-boot-imx-9ac4fc82071ce346e3885118242ff45d22f69b82.tar.bz2
board_init: Change the logic to setup malloc_base
Prior to commit 5ba534d247d418 ("arm: Switch 32-bit ARM to using generic global_data setup") we used to have assembly code that configured the malloc_base address. Since this commit we use the board_init_f_mem() function in C to setup malloc_base address. In board_init_f_mem() there was a deliberate choice to support only early malloc() or full malloc() in SPL, but not both. Adapt this logic to allow both to be used, one after the other, in SPL. This issue has been observed in a Congatec board, where we need to retrieve the manufacturing information from the SPI NOR (the SPI API calls malloc) prior to configuring the DRAM. In this case as malloc_base was not configured we always see malloc to fail. With this change we are able to use malloc in SPL prior to DRAM gets initialized. Also update the CONFIG_SYS_SPL_MALLOC_START entry in the README file. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/init')
-rw-r--r--common/init/board_init.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/common/init/board_init.c b/common/init/board_init.c
index e74b63b..1c6126d 100644
--- a/common/init/board_init.c
+++ b/common/init/board_init.c
@@ -50,8 +50,7 @@ ulong board_init_f_mem(ulong top)
#endif
arch_setup_gd(gd_ptr);
-#if defined(CONFIG_SYS_MALLOC_F) && \
- (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START))
+#if defined(CONFIG_SYS_MALLOC_F)
top -= CONFIG_SYS_MALLOC_F_LEN;
gd->malloc_base = top;
#endif