sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

spl: Remove overwrite of relocated malloc limit 

spl_init on some boards is called after stack and heap relocation, on
some platforms spl_relocate_stack_gd is called to handle setting the
limit to its value CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN when simple
SPL malloc is enabled during relocation. spl_init should then not
re-assign the old pre-relocation limit when this is defined.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Andrew F. Davis 2017-01-27 10:39:19 -06:00 committed by Tom Rini
parent 1923d54bfc
commit b3d2861eb2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/spl/spl.c
View File

@ -183,7 +183,12 @@ int spl_init(void)
int ret;
debug("spl_init()\n");
#if defined(CONFIG_SYS_MALLOC_F_LEN)
/*
* with CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN we set malloc_base and
* malloc_limit in spl_relocate_stack_gd
*/
#if defined(CONFIG_SYS_MALLOC_F_LEN) && \
!defined(CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN)
#ifdef CONFIG_MALLOC_F_ADDR
gd->malloc_base = CONFIG_MALLOC_F_ADDR;
#endif