dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-31 02:15:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

lmb: Fix LMB_MEMORY_REGIONS flag usage

Browse Source 
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: 7c1860fce4 ("lmb: Fix lmb property's defination under struct lmb")
Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Acked-by: Michal Simek <michal.simek@amd.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Patrice Chotard
2022-08-02 10:21:35 +02:00
committed by Tom Rini
parent c252fa5cdb
commit 5e2548c1d6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/lmb.h
View File

@@ -68,7 +68,7 @@ struct lmb_region {
struct lmb { struct lmb {
struct lmb_region memory; struct lmb_region memory;
struct lmb_region reserved; 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 memory_regions[CONFIG_LMB_MEMORY_REGIONS];
struct lmb_property reserved_regions[CONFIG_LMB_RESERVED_REGIONS]; struct lmb_property reserved_regions[CONFIG_LMB_RESERVED_REGIONS];
#endif #endif

2
lib/lmb.c
View File

@@ -108,7 +108,7 @@ void lmb_init(struct lmb *lmb)
#if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS) #if IS_ENABLED(CONFIG_LMB_USE_MAX_REGIONS)
lmb->memory.max = CONFIG_LMB_MAX_REGIONS; lmb->memory.max = CONFIG_LMB_MAX_REGIONS;
lmb->reserved.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->memory.max = CONFIG_LMB_MEMORY_REGIONS;
lmb->reserved.max = CONFIG_LMB_RESERVED_REGIONS; lmb->reserved.max = CONFIG_LMB_RESERVED_REGIONS;
lmb->memory.region = lmb->memory_regions; lmb->memory.region = lmb->memory_regions;