diff options
| author | Tom Rini <[email protected]> | 2021-09-28 13:57:56 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-09-28 13:57:56 -0400 |
| commit | b5d7a200a81097fddef7ba5ec42e330d49fa2f33 (patch) | |
| tree | 1fa564e36db8678724af5817e5163060f2852d54 /include/mtd | |
| parent | 0b9bcf665cd98fe9db0956c894006b250a7d465f (diff) | |
| parent | 24ea366add54b8ca753eb3259bff8b50693dc8ef (diff) | |
Merge branch '2021-09-28-regression-fixes'
- Reintroduce creating internally the "nor%d" style names, in order to
fix some use U-Boot use-cases involving the "mtd" command.
- Fix a regression over the default SPI bus mode shown by having the
compiled default actually start being used. The correct default here
is 0.
- Fix ethernet on imx7d-sdb
- Fix a regression with MTD NAND devices when OF_LIVE is enabled
Diffstat (limited to 'include/mtd')
| -rw-r--r-- | include/mtd/cfi_flash.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/mtd/cfi_flash.h b/include/mtd/cfi_flash.h index 4963c89642f..a1af6fc200f 100644 --- a/include/mtd/cfi_flash.h +++ b/include/mtd/cfi_flash.h @@ -157,11 +157,17 @@ struct cfi_pri_hdr { * Use CONFIG_SYS_MAX_FLASH_BANKS_DETECT if defined */ #if defined(CONFIG_SYS_MAX_FLASH_BANKS_DETECT) -#define CONFIG_SYS_MAX_FLASH_BANKS (cfi_flash_num_flash_banks) #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 CONFIG_SYS_MAX_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 CONFIG_SYS_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS_DETECT +#endif +#else #define CFI_MAX_FLASH_BANKS CONFIG_SYS_MAX_FLASH_BANKS #endif |