diff options
| author | Patrick Delaunay <patrick.delaunay@foss.st.com> | 2022-01-04 16:24:00 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-21 22:01:35 +0300 |
| commit | 0f9595b9fa68ed1634adddf989fd037909eec433 (patch) | |
| tree | 89dae645105ba8e369082ee22165dd0b57898185 /include/configs | |
| parent | 144fef87df7cf29b1ce772a73009e7c16908812b (diff) | |
| download | u-boot-0f9595b9fa68ed1634adddf989fd037909eec433.tar.xz | |
configs: Migrate CONFIG_SYS_MAX_FLASH_BANKS to Kconfig
Use moveconfig.py script to convert define CONFIG_SYS_MAX_FLASH_BANKS
and CONFIG_SYS_MAX_FLASH_BANKS_DETECT to Kconfig and move these entries
to defconfigs.
Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stefan Roese <sr@denx.de>
[trini: Re-switch to IS_ENABLED check in spi-nor-core.c, re-run migration]
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs')
99 files changed, 0 insertions, 122 deletions
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 709a449e79..04ce88c9dd 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -20,7 +20,6 @@ /* * Flash */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index e52fedcf39..e12e54fe4f 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -20,8 +20,6 @@ * CFI Flash */ #define CONFIG_SYS_CFI_FLASH_STATUS_POLL /* fix amd flash issue */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 512 /* diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index 3723c5db0d..e6f42556ff 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -109,7 +109,6 @@ #ifdef CONFIG_SYS_FLASH_CFI # define CONFIG_SYS_FLASH_SIZE 0x800000 /* Max size that the board might have */ # define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -# define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ # define CONFIG_SYS_MAX_FLASH_SECT 254 /* max number of sectors on one chip */ #endif diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 90f1664a5a..9f4c3af4b8 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -126,7 +126,6 @@ #else # define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #endif -# define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ # define CONFIG_SYS_MAX_FLASH_SECT 137 /* max number of sectors on one chip */ #endif diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 00892ec44d..32671494d9 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -89,7 +89,6 @@ # define CONFIG_SYS_FLASH_SIZE 0x1000000 /* Max size that the board might have */ # define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -# define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ # define CONFIG_SYS_MAX_FLASH_SECT 137 /* max number of sectors on one chip */ # define CONFIG_SYS_FLASH_CHECKSUM # define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index c5d8aa3eda..6ba5c52543 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -125,7 +125,6 @@ /* FLASH organization */ #define CONFIG_SYS_FLASH_BASE (CONFIG_SYS_CS0_BASE) -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CONFIG_SYS_MAX_FLASH_SECT 2048 /* max number of sectors on one chip */ #define CONFIG_SYS_FLASH_ERASE_TOUT 1000 diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index e814a2924c..df89a0f961 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -123,7 +123,6 @@ #ifdef CONFIG_SYS_FLASH_CFI # define CONFIG_SYS_FLASH_SIZE 0x800000 /* Max size that the board might have */ # define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -# define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ # define CONFIG_SYS_MAX_FLASH_SECT 137 /* max number of sectors on one chip */ #endif diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index b18f0319b0..7926ed44dc 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -126,7 +126,6 @@ /*----------------------------------------------------------------------- * FLASH organization */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CONFIG_SYS_MAX_FLASH_SECT 11 /* max number of sectors on one chip */ #define CONFIG_SYS_FLASH_ERASE_TOUT 1000 diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 800a731914..df95eead1c 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -129,7 +129,6 @@ # define CONFIG_SYS_FLASH_SIZE 0x1000000 /* Max size that the board might have */ # define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -# define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ # define CONFIG_SYS_MAX_FLASH_SECT 137 /* max number of sectors on one chip */ # define CONFIG_SYS_FLASH_CHECKSUM # define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index d70ebac7fd..ec701867a8 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -128,7 +128,6 @@ # define CONFIG_FLASH_SPANSION_S29WS_N 1 # define CONFIG_SYS_FLASH_SIZE 0x1000000 /* Max size that the board might have */ # define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -# define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ # define CONFIG_SYS_MAX_FLASH_SECT 137 /* max number of sectors on one chip */ #endif diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index e59187d719..865d23c6b5 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -123,7 +123,6 @@ #ifdef CONFIG_SYS_FLASH_CFI # define CONFIG_SYS_FLASH_SIZE 0x800000 /* Max size that the board might have */ # define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -# define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ # define CONFIG_SYS_MAX_FLASH_SECT 137 /* max number of sectors on one chip */ #endif diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index 2a56c9056d..ca13c8cbd3 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -125,7 +125,6 @@ #ifdef CONFIG_SYS_FLASH_CFI # define CONFIG_SYS_FLASH_SIZE 0x800000 /* Max size that the board might have */ # define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -# define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ # define CONFIG_SYS_MAX_FLASH_SECT 137 /* max number of sectors on one chip */ #endif diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h index bfb092ab17..4a26ae8f7f 100644 --- a/include/configs/MCR3000.h +++ b/include/configs/MCR3000.h @@ -69,7 +69,6 @@ /* FLASH organization */ #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 35 #define CONFIG_SYS_FLASH_ERASE_TOUT 120000 #define CONFIG_SYS_FLASH_WRITE_TOUT 500 diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 9a34e5444b..977d96a5a7 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -155,7 +155,6 @@ #define CONFIG_SYS_FLASH_EMPTY_INFO /* display empty sectors */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 256 /* max sectors per device */ #undef CONFIG_SYS_FLASH_CHECKSUM diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index 84e05eafa6..57097b17eb 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -85,7 +85,6 @@ #define CONFIG_SYS_FLASH_BASE 0xff000000 /* start of FLASH 16M */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 64 /* sectors per device */ #undef CONFIG_SYS_FLASH_CHECKSUM #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index f583aa8b36..e16d870a5e 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -133,7 +133,6 @@ #define CONFIG_SYS_FLASH_BANKS_LIST \ {CONFIG_SYS_FLASH_BASE_PHYS + 0x800000, CONFIG_SYS_FLASH_BASE_PHYS} -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 128 /* sectors per device */ #undef CONFIG_SYS_FLASH_CHECKSUM #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index b8a72d01dd..d23cf0e41a 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -86,7 +86,6 @@ #define CONFIG_SYS_FLASH_BASE 0xff000000 /* start of FLASH 16M */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 64 /* sectors per device */ #undef CONFIG_SYS_FLASH_CHECKSUM #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 6a9c86c9c4..23b9969f84 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -267,7 +267,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS} #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #undef CONFIG_SYS_FLASH_CHECKSUM #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 8ada25dcc7..ceaed464fe 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -142,7 +142,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Write Timeout (ms) */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index bf266623c9..d24cfce8b3 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -202,7 +202,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index a1650f5430..f60010f787 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -175,7 +175,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index aaea314e45..f0bdcbae63 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -161,7 +161,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 467f6344fa..86dc5bfe82 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -151,7 +151,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 2d632493c1..6923774a16 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -267,7 +267,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/adp-ae3xx.h b/include/configs/adp-ae3xx.h index 02da55ca42..cac78479db 100644 --- a/include/configs/adp-ae3xx.h +++ b/include/configs/adp-ae3xx.h @@ -153,9 +153,6 @@ #define CONFIG_SYS_CFI_FLASH_STATUS_POLL /* support JEDEC */ -#ifdef CONFIG_CFI_FLASH -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT -#endif /* Do not use CONFIG_FLASH_CFI_LEGACY to detect on board flash */ #define PHYS_FLASH_1 0x88000000 /* BANK 0 */ @@ -171,7 +168,6 @@ * There are 4 banks supported for this Controller, * but we have only 1 bank connected to flash on board */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BANKS_SIZES {0x4000000} /* max number of sectors on one chip */ diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 2ec1d20e9a..d05a4d048f 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -284,7 +284,6 @@ * There are 4 banks supported for this Controller, * but we have only 1 bank connected to flash on board */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BANKS_SIZES {0x4000000} /* max number of sectors on one chip */ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index ecc39be31b..9070845b7a 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -269,7 +269,6 @@ */ #if defined(CONFIG_NOR) #define CONFIG_SYS_MAX_FLASH_SECT 128 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BASE (0x08000000) #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_SYS_FLASH_SIZE 0x01000000 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index f5f2b63b74..63805d3321 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -111,7 +111,6 @@ /* **** PISMO SUPPORT *** */ #define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors */ /* on one chip */ -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* max number of flash banks */ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ #if defined(CONFIG_MTD_RAW_NAND) diff --git a/include/configs/amcore.h b/include/configs/amcore.h index d813af17f7..ae8aa35b6d 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -40,7 +40,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_SIZE 0x1000000 #define CONFIG_SYS_FLASH_BASE 0xffc00000 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 1024 #define CONFIG_SYS_FLASH_ERASE_TOUT 1000 diff --git a/include/configs/armadillo-800eva.h b/include/configs/armadillo-800eva.h index 7714da40dc..d24ba2f0d6 100644 --- a/include/configs/armadillo-800eva.h +++ b/include/configs/armadillo-800eva.h @@ -53,7 +53,6 @@ #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_MAX_FLASH_SECT 512 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BANKS_LIST { (CONFIG_SYS_FLASH_BASE) } #define CONFIG_SYS_FLASH_ERASE_TOUT 3000 diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index d87ca304e2..4f6fb41569 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -227,7 +227,6 @@ (CONFIG_SYS_SDRAM_SIZE << 20)) /* FLASH organization */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 259 #define CONFIG_SYS_FLASH_ERASE_TOUT 1000 diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 5aa9fee2e1..485211c42f 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -58,7 +58,6 @@ #define PHYS_FLASH_1 0x10000000 #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 #define CONFIG_SYS_MAX_FLASH_SECT 256 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MONITOR_SEC 1:0-3 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index 2ad0d1589c..3903dcf3e9 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -79,9 +79,6 @@ #define CONFIG_SYS_CFI_FLASH_STATUS_POLL /* support JEDEC */ -#ifdef CONFIG_CFI_FLASH -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT -#endif/* Do not use CONFIG_FLASH_CFI_LEGACY to detect on board flash */ #define PHYS_FLASH_1 0x88000000 /* BANK 0 */ #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 #define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1, } @@ -95,7 +92,6 @@ * There are 4 banks supported for this Controller, * but we have only 1 bank connected to flash on board */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BANKS_SIZES {0x4000000} /* max number of sectors on one chip */ diff --git a/include/configs/bcm7445.h b/include/configs/bcm7445.h index 81c3d02c6b..4b41dc220b 100644 --- a/include/configs/bcm7445.h +++ b/include/configs/bcm7445.h @@ -28,6 +28,4 @@ * Environment configuration for SPI flash. */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 - #endif /* __CONFIG_H */ diff --git a/include/configs/blanche.h b/include/configs/blanche.h index 882b94f55a..2135ba700e 100644 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_FLASH_BASE 0x00000000 #define CONFIG_SYS_FLASH_SIZE 0x04000000 /* 64 MB */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BANKS_LIST { (CONFIG_SYS_FLASH_BASE) } #define CONFIG_SYS_FLASH_BANKS_SIZES { (CONFIG_SYS_FLASH_SIZE) } diff --git a/include/configs/bmips_bcm6338.h b/include/configs/bmips_bcm6338.h index b7de3f4058..ddaa540513 100644 --- a/include/configs/bmips_bcm6338.h +++ b/include/configs/bmips_bcm6338.h @@ -22,7 +22,5 @@ #define CONFIG_SYS_FLASH_BASE 0xbfc00000 #define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif /* __CONFIG_BMIPS_BCM6338_H */ diff --git a/include/configs/bmips_bcm6348.h b/include/configs/bmips_bcm6348.h index 5ed0eebce4..af1c3673fb 100644 --- a/include/configs/bmips_bcm6348.h +++ b/include/configs/bmips_bcm6348.h @@ -29,7 +29,5 @@ #define CONFIG_SYS_FLASH_BASE 0xbfc00000 #define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif /* __CONFIG_BMIPS_BCM6348_H */ diff --git a/include/configs/bmips_bcm6358.h b/include/configs/bmips_bcm6358.h index 829e9f6b17..6cb09492aa 100644 --- a/include/configs/bmips_bcm6358.h +++ b/include/configs/bmips_bcm6358.h @@ -31,7 +31,5 @@ #define CONFIG_SYS_FLASH_BASE 0xbe000000 #define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif /* __CONFIG_BMIPS_BCM6358_H */ diff --git a/include/configs/bmips_bcm6368.h b/include/configs/bmips_bcm6368.h index 0952b98473..8a22dc1a3c 100644 --- a/include/configs/bmips_bcm6368.h +++ b/include/configs/bmips_bcm6368.h @@ -31,7 +31,5 @@ #define CONFIG_SYS_FLASH_BASE 0xb8000000 #define CONFIG_SYS_FLASH_EMPTY_INFO -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #endif /* __CONFIG_BMIPS_BCM6368_H */ diff --git a/include/configs/boston.h b/include/configs/boston.h index 7ac044e929..347b178633 100644 --- a/include/configs/boston.h +++ b/include/configs/boston.h @@ -41,8 +41,6 @@ * Flash */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 3e19e99c24..81315f6ec7 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -223,7 +223,6 @@ enter a valid image address in flash */ /*----------------------------------------------------------------------- * FLASH organization */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CONFIG_SYS_MAX_FLASH_SECT 11 /* max number of sectors on one chip */ #define CONFIG_SYS_FLASH_ERASE_TOUT 1000 /* flash timeout */ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 3d00860155..975f745c98 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -83,7 +83,6 @@ #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_32BIT #define CONFIG_SYS_MAX_FLASH_SECT (4 + 255) -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_ERASE_TOUT (25 * CONFIG_SYS_HZ) #define CONFIG_SYS_FLASH_WRITE_TOUT (25 * CONFIG_SYS_HZ) diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index f6e0b2a7ea..6d272c6d88 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -140,7 +140,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 97c9276e0e..956a965901 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -145,7 +145,6 @@ #endif #ifdef CONFIG_MTD_NOR_FLASH -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of flash banks */ #define CONFIG_SYS_FLASH_SECT_SZ (128 << 10) /* 128KB */ #define CONFIG_SYS_FLASH_BASE DAVINCI_ASYNC_EMIF_DATA_CE2_BASE #define PHYS_FLASH_SIZE (8 << 20) /* Flash size 8MB */ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index 1e24d05bfb..f30958f0d3 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -39,7 +39,6 @@ /* * NOR Flash */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 71 #define CONFIG_SYS_FLASH_BASE EMC_CS0_BASE #define CONFIG_SYS_FLASH_SIZE SZ_4M diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 900c5fd233..aec30c461d 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -103,7 +103,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 512 #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_SYS_FLASH_SIZE (64 * 1024 * 1024) /* 64 MB */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BASE (0x08000000) #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE /* Reduce SPL size by removing unlikey targets */ diff --git a/include/configs/draak.h b/include/configs/draak.h index 412c57f150..e3e2b6a0bd 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -23,8 +23,6 @@ #define CONFIG_FLASH_SHOW_PROGRESS 45 #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index 62b62e07c5..6ad8722d60 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -116,7 +116,6 @@ #define CONFIG_SYS_INT_FLASH_ENABLE 0x21 #define CONFIG_SYS_MAX_FLASH_SECT 128 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_ERASE_TOUT 10000000 #define CONFIG_SYS_FLASH_SIZE 16*1024*1024 diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h index 87053760e2..178b050a12 100644 --- a/include/configs/ebisu.h +++ b/include/configs/ebisu.h @@ -26,8 +26,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index e20e058e0a..90e387e6c5 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -85,7 +85,6 @@ * FLASH configuration */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max num of flash banks */ #define CONFIG_SYS_MAX_FLASH_SECT 11 /* max num of sects on one chip */ #define CONFIG_SYS_FLASH_BASE 0xfff80000 diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index ccf615efa3..d72f704636 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -32,7 +32,6 @@ #define CONFIG_SYS_SDRAM_SIZE (128 << 20) /* 512kB on-chip NOR flash */ -# define CONFIG_SYS_MAX_FLASH_BANKS 1 # define CONFIG_SYS_FLASH_BASE 0x00200000 /* AT91SAM9XE_FLASH_BASE */ # define CONFIG_AT91_EFLASH # define CONFIG_SYS_MAX_FLASH_SECT 32 diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h index c7fdf7c6bb..7e13464b10 100644 --- a/include/configs/gazerbeam.h +++ b/include/configs/gazerbeam.h @@ -43,7 +43,6 @@ #define CONFIG_SYS_FLASH_BASE 0xFE000000 /* FLASH base address */ #define CONFIG_SYS_FLASH_SIZE 8 /* FLASH size is up to 8M */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 135 #define CONFIG_SYS_BAUDRATE_TABLE \ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index 6be8fb0606..8de89a467c 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -118,7 +118,6 @@ #define CONFIG_SYS_FLASH_SIZE 8 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 128 #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index dffe175f50..641e4037d5 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -77,7 +77,6 @@ */ /* Use buffered writes (~10x faster) */ /* Use hardware sector protection */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of flash banks */ /* CS2 Base address */ #define PHYS_FLASH_1 0xc0000000 /* Flash Base for U-Boot */ diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index b573bdc64f..48d522550e 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -74,7 +74,6 @@ * - U-Boot environment */ #define CONFIG_SYS_FLASH_BASE 0x24000000 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* Timeout values in ticks */ #define CONFIG_SYS_FLASH_ERASE_TOUT (2 * CONFIG_SYS_HZ) /* Erase Timeout */ diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index acac81ad68..abea7517e8 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -60,8 +60,6 @@ #define CONFIG_CQSPI_REF_CLK 133333333 /* HyperFlash related configuration */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT /* U-Boot general configuration */ #define EXTRA_ENV_J721E_BOARD_SETTINGS \ diff --git a/include/configs/km/km-mpc83xx.h b/include/configs/km/km-mpc83xx.h index 45db5cf873..7c979c5fa9 100644 --- a/include/configs/km/km-mpc83xx.h +++ b/include/configs/km/km-mpc83xx.h @@ -56,7 +56,6 @@ */ #define CONFIG_SYS_FLASH_SIZE 256 /* max FLASH size is 256M */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max num of flash banks */ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* max num of sects on one chip */ #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h index ba0e4dd5c6..9d7a9e18d5 100644 --- a/include/configs/km/pg-wcom-ls102xa.h +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -68,7 +68,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 98e572397b..ca0cb31c29 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -246,7 +246,6 @@ /* More NOR Flash params */ #define CONFIG_SYS_FLASH_QUIET_TEST -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 512 /* sectors per device */ #define CONFIG_SYS_FLASH_EMPTY_INFO diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 1eb6dafe20..022858f692 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -20,7 +20,6 @@ #define KZM_FLASH_BASE (0x00000000) #define CONFIG_SYS_FLASH_BASE (KZM_FLASH_BASE) #define CONFIG_SYS_FLASH_CFI_WIDTH (FLASH_CFI_16BIT) -#define CONFIG_SYS_MAX_FLASH_BANKS (1) #define CONFIG_SYS_MAX_FLASH_SECT (512) /* prompt */ diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 7edb5c6180..8c4cb7b720 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -102,7 +102,6 @@ #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS #define CONFIG_SYS_WRITE_SWAPPED_DATA -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index d4c6f4fcf8..dcee79de88 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -114,7 +114,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index 80eff7b1a9..5f9cb97855 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -90,7 +90,6 @@ FTIM2_NOR_TWP(0x1c)) #define CONFIG_SYS_NOR_FTIM3 0 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 8b01c17727..6d9cbc8c7d 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -55,7 +55,6 @@ #define CONFIG_SYS_NOR_FTIM3 0 #define CONFIG_SYS_IFC_CCR 0x01000000 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 97bf4182be..3d72c67a54 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -97,7 +97,6 @@ FTIM2_NOR_TWP(0x1c)) #define CONFIG_SYS_NOR_FTIM3 0 -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 5912fe95cc..2d33ab0794 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -72,7 +72,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 400b8adb24..4cb5d7517f 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -60,7 +60,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index b0a05dd807..07cf59fcb8 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -85,7 +85,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index a54387e16c..6d8effea74 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -87,7 +87,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 1024 /* sectors per device */ #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index afa0206fb9..e8e02e7f7b 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -19,7 +19,6 @@ * Environment variables configurations */ #ifdef CONFIG_SPI_FLASH -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 8 #endif diff --git a/include/configs/malta.h b/include/configs/malta.h index 8ace0ccd7e..61860ee694 100644 --- a/include/configs/malta.h +++ b/include/configs/malta.h @@ -54,7 +54,6 @@ #else # define CONFIG_SYS_FLASH_BASE 0xbe000000 #endif -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 128 /* diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index d084497024..59184290f3 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -36,8 +36,6 @@ #define CONFIG_FLASH_VERIFY /* NOR Flash MTD */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_FLASH_BANKS_LIST { (CONFIG_SYS_FLASH_BASE) } #define CONFIG_SYS_FLASH_BANKS_SIZES { (32 * SZ_1M) } diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 28f67e30d5..ca749ed18a 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -29,7 +29,6 @@ /* ?empty sector */ # define CONFIG_SYS_FLASH_EMPTY_INFO 1 /* max number of memory banks */ -# define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of sectors on one chip */ # define CONFIG_SYS_MAX_FLASH_SECT 2048 #endif diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 11de96fec2..a212652fd7 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -40,7 +40,6 @@ #ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR #define CONFIG_SYS_FLASH_SECT_SIZE (128 * 1024) -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CONFIG_SYS_MAX_FLASH_SECT 256 /* max number of sectors on one chip */ #define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT diff --git a/include/configs/octeon_ebb7304.h b/include/configs/octeon_ebb7304.h index 04fe4dfe22..358db69a05 100644 --- a/include/configs/octeon_ebb7304.h +++ b/include/configs/octeon_ebb7304.h @@ -12,7 +12,6 @@ /* * CFI flash */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_8BIT #define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 211f39a0fa..4719184b5e 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -154,7 +154,6 @@ #endif #define CONFIG_SYS_MAX_FLASH_SECT 256 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_SYS_FLASH_SIZE 0x4000000 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 2e1331b9b0..b993ec8316 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -254,8 +254,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ - #undef CONFIG_SYS_FLASH_CHECKSUM #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ #define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index be24d82538..f3196ee847 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -161,7 +161,6 @@ #define PHYS_FLASH_1 0x10000000 #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 #define CONFIG_SYS_MAX_FLASH_SECT 256 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* USB */ #define CONFIG_USB_ATMEL diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index e9eb736ecb..4856f61527 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -163,7 +163,6 @@ #define PHYS_FLASH_1 0x10000000 #define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1 #define CONFIG_SYS_MAX_FLASH_SECT 256 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* NAND flash */ #ifdef CONFIG_CMD_NAND diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 433e0b13a5..d45f606860 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -66,8 +66,6 @@ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_MAX_FLASH_BANKS 2 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 256 /* Sector: 256K, Bank: 64M */ #define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index ae57f681a5..618c3b63d4 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -25,8 +25,6 @@ #define CONFIG_STANDALONE_LOAD_ADDR 0x80200000 -#define CONFIG_SYS_MAX_FLASH_BANKS 2 - #define RISCV_MMODE_TIMERBASE 0x2000000 #define RISCV_MMODE_TIMER_FREQ 1000000 diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 8e86830e61..e3105fe53c 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -21,7 +21,6 @@ * NOR Flash ( Spantion S29GL256P ) */ #define CONFIG_SYS_FLASH_BASE (0xA0000000) -#define CONFIG_SYS_MAX_FLASH_BANKS (1) #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index da3e2c8856..9542b0d1b5 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -24,8 +24,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 67640f4415..3be2c83fce 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -32,7 +32,6 @@ #ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_SYS_FLASH_BASE 0x10000000 #define CONFIG_SYS_MAX_FLASH_SECT 131 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #endif /* SDRAM */ diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h index ebb3e8c573..c20d54a3c5 100644 --- a/include/configs/socfpga_arria10_socdk.h +++ b/include/configs/socfpga_arria10_socdk.h @@ -30,7 +30,6 @@ /* * Flash configurations */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* SPL memory allocation configuration, this is for FAT implementation */ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00015000 diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 928582ab8c..8646dc2318 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -136,7 +136,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); /* * Flash configurations */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* Ethernet on SoC (EMAC) */ #if defined(CONFIG_CMD_NET) diff --git a/include/configs/socrates.h b/include/configs/socrates.h index ce3f9ce0e5..a51a162ee0 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -93,7 +93,6 @@ #define CONFIG_SYS_LBC_FLASH_BASE CONFIG_SYS_FLASH1 /* Localbus flash start */ #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_LBC_FLASH_BASE /* start of FLASH */ -#define CONFIG_SYS_MAX_FLASH_BANKS 2 /* number of banks */ #define CONFIG_SYS_MAX_FLASH_SECT 256 /* sectors per device */ #undef CONFIG_SYS_FLASH_CHECKSUM #define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 2fe0900e9f..4c464cfbe5 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -51,8 +51,6 @@ /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 - /* USB Configs */ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 8dddd5449e..c9649a085e 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -16,7 +16,6 @@ */ #define CONFIG_SYS_MAX_FLASH_SECT 12 -#define CONFIG_SYS_MAX_FLASH_BANKS 2 #define CONFIG_RED_LED 110 #define CONFIG_GREEN_LED 109 diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index c490e2d98b..4c421b9596 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -21,7 +21,6 @@ */ #define CONFIG_SYS_MAX_FLASH_SECT 12 -#define CONFIG_SYS_MAX_FLASH_BANKS 2 #define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */ diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index 246dc1f9c6..e91f8da280 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -21,7 +21,6 @@ */ #define CONFIG_SYS_MAX_FLASH_SECT 12 -#define CONFIG_SYS_MAX_FLASH_BANKS 2 #define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 2f2a349dcd..8ad4bb99c8 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -20,7 +20,6 @@ */ #define CONFIG_SYS_MAX_FLASH_SECT 8 -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_DW_GMAC_DEFAULT_DMA_PBL (8) #define CONFIG_DW_ALTDESCRIPTOR diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h index 0409589152..8dd092fc59 100644 --- a/include/configs/synquacer.h +++ b/include/configs/synquacer.h @@ -37,7 +37,6 @@ #define CONFIG_PL01x_PORTS {(void *)(0x2a400000)} /* Support MTD */ -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_BASE (0x08000000) #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE} diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h index c752da374b..9638ab2017 100644 --- a/include/configs/total_compute.h +++ b/include/configs/total_compute.h @@ -57,7 +57,6 @@ #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_32BIT -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #define CONFIG_SYS_FLASH_EMPTY_INFO /* flinfo indicates empty blocks */ #define FLASH_MAX_SECTOR_SIZE 0x00040000 diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index c22c30c86f..ca79b0352a 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -24,8 +24,6 @@ #define CONFIG_SYS_FLASH_QUIET_TEST #define CONFIG_SYS_FLASH_BANKS_LIST { 0x08000000 } #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -#define CONFIG_SYS_MAX_FLASH_BANKS 1 -#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT #define CONFIG_SYS_MAX_FLASH_SECT 256 #define CONFIG_SYS_WRITE_SWAPPED_DATA diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 54e8caeb7b..9bf5774a7f 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -210,7 +210,6 @@ #endif #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_32BIT -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_OHCI_NEW diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 91d50bc4a0..5f119aeb3d 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -176,7 +176,6 @@ /* FLASH and environment organization */ #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */ #define CONFIG_SYS_FLASH_SIZE 0x04000000 -#define CONFIG_SYS_MAX_FLASH_BANKS 2 #define CONFIG_SYS_FLASH_BASE0 V2M_NOR0 #define CONFIG_SYS_FLASH_BASE1 V2M_NOR1 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE0 diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index c8a6e9a61a..8c2cdb5cbd 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -181,7 +181,6 @@ /*=====================*/ #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT -#define CONFIG_SYS_MAX_FLASH_BANKS 1 #ifdef CONFIG_XTFPGA_LX60 # define CONFIG_SYS_FLASH_SIZE 0x0040000 /* 4MB */ # define CONFIG_SYS_FLASH_SECT_SZ 0x10000 /* block size 64KB */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index dc6c2377e8..1bda0a6690 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -35,7 +35,6 @@ /* NOR */ #ifdef CONFIG_MTD_NOR_FLASH -# define CONFIG_SYS_MAX_FLASH_BANKS 1 # define CONFIG_SYS_MAX_FLASH_SECT 512 # define CONFIG_SYS_FLASH_ERASE_TOUT 1000 # define CONFIG_SYS_FLASH_WRITE_TOUT 5000 |