From 144fef87df7cf29b1ce772a73009e7c16908812b Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Tue, 4 Jan 2022 14:23:59 +0100 Subject: mtd: cfi: change CONFIG_SYS_MAX_FLASH_BANKS_DETECT as boolean Prepare migration to Kconfig. CONFIG_SYS_MAX_FLASH_BANKS_DETECT becomes boolean and CONFIG_SYS_MAX_FLASH_BANKS define the MAX size, also used for detection when CONFIG_SYS_MAX_FLASH_BANKS_DETECT=y (CFI_MAX_FLASH_BANKS = CONFIG_SYS_MAX_FLASH_BANKS). CONFIG_SYS_MAX_FLASH_BANKS become mandatory when CONFIG_SYS_MAX_FLASH_BANKS_DETECT is activated. Signed-off-by: Patrick Delaunay Reviewed-by: Stefan Roese --- include/mtd/cfi_flash.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/mtd') diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h index d62c8f18fc0..d4aeea7e464 100644 --- a/include/mtd/cfi_flash.h +++ b/include/mtd/cfi_flash.h @@ -158,19 +158,19 @@ struct cfi_pri_hdr { * cfi_flash_num_flash_banks when CONFIG_SYS_MAX_FLASH_BANKS_DETECT is defined * or CONFIG_SYS_MAX_FLASH_BANKS */ +#define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS + #if defined(CONFIG_SYS_MAX_FLASH_BANKS_DETECT) -#define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS_DETECT /* map to cfi_flash_num_flash_banks only when supported */ #if IS_ENABLED(CONFIG_FLASH_CFI_DRIVER) && \ (!IS_ENABLED(CONFIG_SPL_BUILD) || IS_ENABLED(CONFIG_SPL_MTD_SUPPORT)) #define CFI_FLASH_BANKS (cfi_flash_num_flash_banks) /* board code can update this variable before CFI detection */ extern int cfi_flash_num_flash_banks; -#else -#define CFI_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif -#else -#define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS +#endif +/* default when bank detection is not supported */ +#ifndef CFI_FLASH_BANKS #define CFI_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS #endif -- cgit v1.3.1