From: Tom Rini <trini@konsulko.com>
Date: Mon, 20 Mar 2017 18:19:27 +0000 (-0400)
Subject: spl: Correct call to spl_common_init() with SPL_STACK_R_MALLOC_SIMPLE_LEN
X-Git-Tag: v2017.05-rc1~27
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cf334edfbb78ddabbc22ac78b842eb2d8c10ff16;p=u-boot

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
---

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;
 	}