diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-20 14:19:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-21 07:14:17 -0400 |
| commit | cf334edfbb78ddabbc22ac78b842eb2d8c10ff16 (patch) | |
| tree | 99ab05a63b3d61d6e2e6ba1254e33729a2681ef0 /common/spl | |
| parent | 274bced86db206dd9d3f22e932fd7a58907ff9d2 (diff) | |
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: 340f418acd11 ("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
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index d98b9fcb9a..0d1e08245f 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -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; } |