[U-Boot] [PATCH] spl: Correct call to spl_common_init() with SPL_STACK_R_MALLOC_SIMPLE_LEN

Lokesh Vutla lokeshvutla at ti.com
Tue Mar 21 02:39:52 UTC 2017



On Monday 20 March 2017 11:49 PM, Tom Rini wrote:
> 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 at ti.com>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
>  common/spl/spl.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/common/spl/spl.c b/common/spl/spl.c
> index d98b9fcb9ade..91180d4b476b 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(SPL_SYS_MALLOC_SIMPLE));

This should be CONFIG_SPL_SYS_MALLOC_SIMPLE. With this change it works fine.

Thanks and regards,
Lokesh


More information about the U-Boot mailing list