[PATCH] lmb: Fix LMB_MEMORY_REGIONS flag usage

[Michal Simek]

On 8/2/22 10:21, Patrice Chotard wrote:
> This patch is fixing a broken boot observed on stm32mp157c-dk2 board.
> 
> IS_ENABLED macro should be used to check if a compilation flag is set
> to "y" or "m".
> LMB_MEMORY_REGIONS is set to a numerical value, IS_ENABLED macro is not
> suitable in this case.
> 
> Fixes: 7c1860fce4e3 ("lmb: Fix lmb property's defination under struct lmb")
> Signed-off-by: Patrice Chotard <patrice.chotard at foss.st.com>
> ---
> 
>   include/lmb.h | 2 +-
>   lib/lmb.c     | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/include/lmb.h b/include/lmb.h
> index 1476d78c28..7298c2ccc4 100644
> --- a/include/lmb.h
> +++ b/include/lmb.h
> @@ -68,7 +68,7 @@ struct lmb_region {
>   struct lmb {
>   	struct lmb_region memory;
>   	struct lmb_region reserved;
> -#if IS_ENABLED(CONFIG_LMB_MEMORY_REGIONS)
> +#ifdef CONFIG_LMB_MEMORY_REGIONS
>   	struct lmb_property memory_regions[CONFIG_LMB_MEMORY_REGIONS];
>   	struct lmb_property reserved_regions[CONFIG_LMB_RESERVED_REGIONS];
>   #endif
> diff --git a/lib/lmb.c b/lib/lmb.c
> index f21fe672ae..c599608fa3 100644
> --- a/lib/lmb.c
> +++ b/lib/lmb.c
> @@ -108,7 +108,7 @@ void lmb_init(struct lmb *lmb)
>   #if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS)
>   	lmb->memory.max = CONFIG_LMB_MAX_REGIONS;
>   	lmb->reserved.max = CONFIG_LMB_MAX_REGIONS;
> -#elif IS_ENABLED(CONFIG_LMB_MEMORY_REGIONS)
> +#elif defined(CONFIG_LMB_MEMORY_REGIONS)
>   	lmb->memory.max = CONFIG_LMB_MEMORY_REGIONS;
>   	lmb->reserved.max = CONFIG_LMB_RESERVED_REGIONS;
>   	lmb->memory.region = lmb->memory_regions;

Acked-by: Michal Simek <michal.simek at amd.com>

Tom: Can you pick this up directly?

Thanks,
Michal