Skip to content
Snippets Groups Projects
Commit cf334edf authored by Tom Rini's avatar Tom Rini
Browse files

spl: Correct call to spl_common_init() with SPL_STACK_R_MALLOC_SIMPLE_LEN


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: 340f418a ("spl: Add spl_early_init()")
Reported-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: default avatarTom Rini <trini@konsulko.com>
---
Changes in v2:
- Fix thinko pointed out by Lokesh
parent 274bced8
No related branches found
No related tags found
No related merge requests found
......@@ -227,10 +227,11 @@ int spl_early_init(void)
int spl_init(void)
{
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)) {
ret = spl_common_init(
!IS_ENABLED(CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN));
ret = spl_common_init(setup_malloc);
if (ret)
return ret;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment