GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spl: Correct call to spl_common_init() with SPL_STACK_R_MALLOC_SIMPLE_LEN

Browse source 
Calls to IS_ENABLED() on a non-y/n option will always be false, even
when set.  We can correct this by adding a new bool value that is set
based on the conditions required for SPL_STACK_R_MALLOC_SIMPLE_LEN to be
set instead.

Fixes: 340f418acd ("spl: Add spl_early_init()")
Reported-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Changes in v2:
- Fix thinko pointed out by Lokesh
This commit is contained in:
Tom Rini 2017-03-20 14:19:27 -04:00
parent 274bced86d
commit cf334edfbb
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/spl/spl.c
View file

@ -227,10 +227,11 @@ int spl_early_init(void)
int spl_init(void) int spl_init(void)
{ {
int ret; int ret;
bool setup_malloc = !(IS_ENABLED(CONFIG_SPL_STACK_R) &&
IS_ENABLED(CONFIG_SPL_SYS_MALLOC_SIMPLE));
if (!(gd->flags & GD_FLG_SPL_EARLY_INIT)) { if (!(gd->flags & GD_FLG_SPL_EARLY_INIT)) {
ret = spl_common_init( ret = spl_common_init(setup_malloc);
!IS_ENABLED(CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN));
if (ret) if (ret)
return ret; return ret;
} }