diff options
| author | Bin Meng <bmeng.cn@gmail.com> | 2015-11-25 05:34:54 -0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-25 10:06:05 -0500 |
| commit | 68d534201733e84257e357f7ddcb379dbe1cc5d0 (patch) | |
| tree | 6575dc12188d18489456b455539aa3bd25bbd752 /include | |
| parent | e5d5d4474ace2136009139e264b8edf2cddb13cb (diff) | |
sf: Move SPI flash drivers to defconfig
There are already Kconfig options for SPI flash drivers, but we
have not moved them from config.h to defconfig files. This commit
does this in a batch.
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'include')
124 files changed, 0 insertions, 179 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index e8775c6d8c9..9fb5cee711f 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -586,7 +586,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_SST #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index b3e7218272e..4b5ad0eade9 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -275,7 +275,6 @@ extern unsigned long get_sdram_size(void); /* eSPI - Enhanced SPI */ #ifdef CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index ea99a5066e2..d0e5a2565a9 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -479,7 +479,6 @@ combinations. this should be removed later */ /* eSPI - Enhanced SPI */ #ifdef CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index ed335780bd7..16920c60320 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -426,8 +426,6 @@ #define CONFIG_CMD_I2C /* eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_SPANSION -#define CONFIG_SPI_FLASH_EON #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index ffee2250bb5..f2ea9a8c970 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -131,7 +131,6 @@ #define CONFIG_SYS_SBFHDR_SIZE 0x7 #ifdef CONFIG_CMD_SPI # define CONFIG_SYS_DSPI_CS2 -# define CONFIG_SPI_FLASH_STMICRO # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ DSPI_CTAR_PCSSCK_1CLK | \ diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 927b7daf8a7..05ba13b96ea 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -193,7 +193,6 @@ #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x7 #ifdef CONFIG_CMD_SPI -# define CONFIG_SPI_FLASH_ATMEL # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ DSPI_CTAR_PCSSCK_1CLK | \ diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 61ebb242147..c778823dd5b 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -141,7 +141,6 @@ #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x7 #ifdef CONFIG_CMD_SPI -# define CONFIG_SPI_FLASH_STMICRO # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ DSPI_CTAR_PCSSCK_1CLK | \ diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index f813dab4b17..794104098d6 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -173,7 +173,6 @@ #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x13 #ifdef CONFIG_CMD_SPI -# define CONFIG_SPI_FLASH_STMICRO # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ DSPI_CTAR_PCSSCK_1CLK | \ diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 87afa317a4e..955ce629a1f 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -353,7 +353,6 @@ #ifdef CONFIG_MPC8XXX_SPI #define CONFIG_CMD_SPI #define CONFIG_USE_SPIFLASH -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #endif diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 5c63f34a302..294be3b53bf 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -421,7 +421,6 @@ #define CONFIG_HARD_SPI #if defined(CONFIG_SPI_FLASH) -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 81e8757eacc..f9776c03330 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -675,7 +675,6 @@ extern unsigned long get_sdram_size(void); */ #if !defined(CONFIG_NAND) || !defined(CONFIG_NAND_SECBOOT) /* eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 4191736b3ab..6235bbbc4e2 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -477,7 +477,6 @@ /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_HARD_SPI diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index f196ccf122e..b2e51b5b2f6 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -409,7 +409,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 9cfd92f0e9f..951cbc4f57c 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -578,10 +578,7 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_STMICRO #ifndef CONFIG_SPL_BUILD -#define CONFIG_SPI_FLASH_SST -#define CONFIG_SPI_FLASH_EON #endif #define CONFIG_CMD_SF #define CONFIG_SPI_FLASH_BAR diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 2131591a0c3..4a0f5b25245 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -568,9 +568,7 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #if defined(CONFIG_T1024RDB) -#define CONFIG_SPI_FLASH_STMICRO #elif defined(CONFIG_T1023RDB) -#define CONFIG_SPI_FLASH_SPANSION #endif #define CONFIG_CMD_SF #define CONFIG_SPI_FLASH_BAR diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 6cf28d004dc..9e151da16a4 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -482,9 +482,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SPI_FLASH_SST -#define CONFIG_SPI_FLASH_EON #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 3ffbf17af18..da65f567ea8 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -537,7 +537,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_BAR #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index c0c8c09decd..a0cecc60cdc 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -550,10 +550,7 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #ifdef CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO #ifndef CONFIG_SPL_BUILD -#define CONFIG_SPI_FLASH_SST -#define CONFIG_SPI_FLASH_EON #endif #define CONFIG_CMD_SF diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index bd275208c4d..312b0eb91f7 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -504,7 +504,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #ifdef CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_BAR #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 655b2029d12..1b94f6436c8 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -401,7 +401,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_SST #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 6d507914e09..73279c899e8 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -609,7 +609,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_SST #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 03c790df218..23540092320 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -380,9 +380,6 @@ */ #define CONFIG_HARD_SPI -#define CONFIG_SPI_FLASH_SST 1 -#define CONFIG_SPI_FLASH_STMICRO 1 -#define CONFIG_SPI_FLASH_WINBOND 1 #define CONFIG_CMD_SF 1 #define CONFIG_CMD_SPI 1 #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/alt.h b/include/configs/alt.h index 6d2c242b950..6bd2983bbca 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -42,7 +42,6 @@ /* FLASH */ #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_QUAD #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index d501f04218f..c51db8c5c33 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -468,7 +468,6 @@ /* SPI flash. */ #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_SPEED 24000000 /* Network. */ diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 5bd89a23a17..aac550a477a 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -219,7 +219,6 @@ /* SPI */ #undef CONFIG_OMAP3_SPI -#define CONFIG_SPI_FLASH_MACRONIX #define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_TI_SPI_MMAP diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index f03297e1377..0b97cccc582 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -43,7 +43,6 @@ #define CONFIG_CMD_SF #define CONFIG_SPI_FLASH_MTD -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 8fa5ff5fc00..ba91d1f11f8 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -93,7 +93,6 @@ /* DataFlash */ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_ENV_SPI_MODE SPI_MODE_3 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 20a5581cf2b..45bb861922c 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -92,7 +92,6 @@ /* DataFlash */ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_SPEED 30000000 #endif diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index c436fef7b5c..11d7d0c00db 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -100,7 +100,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index 39358113d2b..0dcc192b4af 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -120,7 +120,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 9917627fc0b..943ba170022 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -580,7 +580,6 @@ DEFAULT_LINUX_BOOT_ENV \ /* SPI flash. */ #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_SPEED 24000000 /* Network. */ diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 326e73e57ed..bf7b96b5f3d 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -52,7 +52,6 @@ /* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_CMD_SPI diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h index 64db3acd2fb..597f1cd5d1b 100644 --- a/include/configs/bf506f-ezkit.h +++ b/include/configs/bf506f-ezkit.h @@ -73,7 +73,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 /* -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_CMD_SF #define CONFIG_CMD_SPI */ diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h index b7ceba40cb9..84bb044421e 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -105,8 +105,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_SST -#define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h index fce6fc2e12a..d12963a5f0b 100644 --- a/include/configs/bf525-ucr2.h +++ b/include/configs/bf525-ucr2.h @@ -69,7 +69,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_HZ 30000000 -#define CONFIG_SPI_FLASH_EON #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_MAX_HZ 30000000 diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index a8f0979624a..35a2228a6b8 100644 --- a/include/configs/bf526-ezbrd.h +++ b/include/configs/bf526-ezbrd.h @@ -103,7 +103,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_SST /* diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h index 1c5fc9e4929..2f3dec5b09a 100644 --- a/include/configs/bf527-ad7160-eval.h +++ b/include/configs/bf527-ad7160-eval.h @@ -89,7 +89,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index d23602bb329..aee776132c6 100644 --- a/include/configs/bf527-ezkit.h +++ b/include/configs/bf527-ezkit.h @@ -101,7 +101,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index c57c8628bf9..4fbdca7239a 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -101,7 +101,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index e922bd5637b..2474adb5557 100644 --- a/include/configs/bf537-pnav.h +++ b/include/configs/bf537-pnav.h @@ -82,7 +82,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index 90aeeec5d1e..89d26043da4 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -100,7 +100,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index f0f768ac092..65009c6f28d 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -92,7 +92,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h index b3c6d299959..92251fc0bde 100644 --- a/include/configs/bf561-acvilon.h +++ b/include/configs/bf561-acvilon.h @@ -114,7 +114,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 10000000 #define CONFIG_SF_DEFAULT_SPEED 10000000 -#define CONFIG_SPI_FLASH_ATMEL /* diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 91a84feaf41..9c537e0a589 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -278,13 +278,6 @@ * SPI Settings */ #ifdef CONFIG_SPI_FLASH_ALL -# define CONFIG_SPI_FLASH_ATMEL -# define CONFIG_SPI_FLASH_EON -# define CONFIG_SPI_FLASH_MACRONIX -# define CONFIG_SPI_FLASH_SPANSION -# define CONFIG_SPI_FLASH_SST -# define CONFIG_SPI_FLASH_STMICRO -# define CONFIG_SPI_FLASH_WINBOND #endif /* diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index 9abbc39f834..05c932f51e6 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -48,7 +48,6 @@ /* SPI FLASH */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 40000000 diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h index 3b7a47f8d6c..60650aa77bb 100644 --- a/include/configs/blackstamp.h +++ b/include/configs/blackstamp.h @@ -216,7 +216,6 @@ /* For the M25P64 SCK Should be Kept < 15Mhz */ #define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_SF_DEFAULT_SPEED 15000000 -#define CONFIG_SPI_FLASH_STMICRO /* * FLASH organization and environment definitions diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h index 5b15e0efba7..16949aa9293 100644 --- a/include/configs/blackvme.h +++ b/include/configs/blackvme.h @@ -142,7 +142,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 15000000 #define CONFIG_SF_DEFAULT_SPEED 15000000 -#define CONFIG_SPI_FLASH_STMICRO /* * Interactive command settings diff --git a/include/configs/br4.h b/include/configs/br4.h index 959f9a92f02..7dda472fe7e 100644 --- a/include/configs/br4.h +++ b/include/configs/br4.h @@ -82,7 +82,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 6607ffc7f02..9a8c989b769 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -55,7 +55,6 @@ /* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_CMD_SPI diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 02a1a76911f..d3cd38d70f3 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -69,14 +69,6 @@ /* SPI Flash support */ #define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_MACRONIX -#define CONFIG_SPI_FLASH_ATMEL -#define CONFIG_SPI_FLASH_EON -#define CONFIG_SPI_FLASH_GIGADEVICE -#define CONFIG_SPI_FLASH_SPANSION -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SPI_FLASH_SST -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_TI_SPI_MMAP #define CONFIG_SPI_FLASH_BAR #define CONFIG_SF_DEFAULT_SPEED 48000000 diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index af4676e9925..641aa7ce42c 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -216,7 +216,6 @@ */ #define CONFIG_HARD_SPI -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 81fbfa843ce..aef37dd670b 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -414,7 +414,6 @@ /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index c052e8aaed5..ffd65d54393 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -29,7 +29,6 @@ #define CONFIG_SCSI_DEV_LIST \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SATA} -#define CONFIG_SPI_FLASH_SST #define CONFIG_MMC #define CONFIG_SDHCI diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index d90141cc30b..63abb80e966 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -141,8 +141,6 @@ #define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_CMD_SF #define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 2251f591ebf..944e82f55f6 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -49,7 +49,6 @@ #define MACH_TYPE_DALMORE 4304 /* not yet in mach-types.h */ /* SPI */ -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_CMD_SPI diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 9a0596c5118..3673e5e3687 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -60,7 +60,6 @@ /* SPI NOR flash default params, used by sf commands */ #define CONFIG_SF_DEFAULT_SPEED 1000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 -#define CONFIG_SPI_FLASH_STMICRO /* * SDIO/MMC Card Configuration diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index b3b2de942f3..ab6e5a5bce1 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -56,7 +56,6 @@ /* SPI NOR flash default params, used by sf commands */ #define CONFIG_SF_DEFAULT_SPEED 1000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 -#define CONFIG_SPI_FLASH_STMICRO /* Environment in SPI NOR flash */ #define CONFIG_ENV_IS_IN_SPI_FLASH diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 951697998f0..81070b1fd0d 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -135,7 +135,6 @@ /* SPI */ #undef CONFIG_OMAP3_SPI -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_TI_SPI_MMAP diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 3f35616bcaa..0b7d89b98d1 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -61,7 +61,6 @@ #ifdef CONFIG_CMD_SF #define CONFIG_HARD_SPI 1 #define CONFIG_KIRKWOOD_SPI 1 -#define CONFIG_SPI_FLASH_MACRONIX 1 #define CONFIG_ENV_SPI_BUS 0 #define CONFIG_ENV_SPI_CS 0 #define CONFIG_ENV_SPI_MAX_HZ 50000000 /* 50 MHz */ diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index 998a69aba10..18a63d7ec71 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -35,7 +35,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) /* SPI */ -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_CMD_SPI diff --git a/include/configs/ea20.h b/include/configs/ea20.h index ee443a96304..10b30c17cf8 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -66,7 +66,6 @@ #define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index f55ba9f7066..90cd95929fa 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -65,7 +65,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_SST #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index d6e04568889..23a29358066 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -59,7 +59,6 @@ /* 512kB DataFlash at NPCS0 */ #define CONFIG_SYS_MAX_DATAFLASH_BANKS 1 #define CONFIG_HAS_DATAFLASH -#define CONFIG_SPI_FLASH_ATMEL #define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 #define DATAFLASH_TCSS (0x1a << 16) diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 1fe12b5374e..9c3ea883ff3 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -131,8 +131,6 @@ #ifdef CONFIG_SPI_FLASH #define CONFIG_CMD_SF #define CONFIG_CMD_SPI -#define CONFIG_SPI_FLASH_WINBOND -#define CONFIG_SPI_FLASH_GIGADEVICE #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 50000000 #endif diff --git a/include/configs/gose.h b/include/configs/gose.h index c08e73ac691..4e298258dc0 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH_SPANSION /* SH Ether */ #define CONFIG_SH_ETHER diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index f2fd2ae9a36..52c67d56014 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -91,7 +91,6 @@ /* Flash Support */ #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_ATMEL /* * mv-common.h should be defined after CMD configs since it used them diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 48010ebce82..b7b9c78c2e1 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -70,7 +70,6 @@ #define CONFIG_MXC_SPI #define CONFIG_SPI_FLASH_MTD #define CONFIG_SPI_FLASH_BAR - #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 /* GPIO 3-19 (21248) */ diff --git a/include/configs/ip04.h b/include/configs/ip04.h index dd2a618a882..0993ffa4443 100644 --- a/include/configs/ip04.h +++ b/include/configs/ip04.h @@ -91,8 +91,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SPI_FLASH_WINBOND /* diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index f63957ab92f..b39ddf67068 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -39,7 +39,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* SPI */ -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_CMD_SPI diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 750b7e93105..d1f0b12b0ef 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -252,7 +252,6 @@ int get_scl(void); #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_SPI_FLASH_STMICRO /* SPI bus claim MPP configuration */ #define CONFIG_SYS_KW_SPI_MPP 0x0 diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index e2cbbb11b88..6860ad2a4bd 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -297,8 +297,6 @@ int get_scl(void); * eSPI - Enhanced SPI */ #define CONFIG_SPI_FLASH_BAR /* 4 byte-addressing */ -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index c905cc2dc2e..caeb14d586f 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -44,7 +44,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH_SPANSION /* SH Ether */ #define CONFIG_SH_ETHER diff --git a/include/configs/lager.h b/include/configs/lager.h index 1450e8f53fa..ad8b12ffa26 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -43,7 +43,6 @@ /* SPI */ #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SYS_NO_FLASH /* SH Ether */ diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index f1cc3b6f80e..00640cd0550 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -416,7 +416,6 @@ unsigned long get_board_ddr_clk(void); #define QSPI0_AMBA_BASE 0x40000000 #define FSL_QSPI_FLASH_SIZE (1 << 24) #define FSL_QSPI_FLASH_NUM 2 -#define CONFIG_SPI_FLASH_SPANSION /* DSPI */ diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 206826b3279..c12ba3ac910 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -313,10 +313,8 @@ #define QSPI0_AMBA_BASE 0x40000000 #define FSL_QSPI_FLASH_SIZE (1 << 24) #define FSL_QSPI_FLASH_NUM 2 -#define CONFIG_SPI_FLASH_STMICRO /* DSPI */ -#define CONFIG_SPI_FLASH_ATMEL #endif /* DM SPI */ diff --git a/include/configs/ls2085aqds.h b/include/configs/ls2085aqds.h index 406d0e6d47e..8a97f758e5d 100644 --- a/include/configs/ls2085aqds.h +++ b/include/configs/ls2085aqds.h @@ -277,9 +277,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_FSL_DSPI #define CONFIG_CMD_SF #define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SPI_FLASH_SST -#define CONFIG_SPI_FLASH_EON #endif /* diff --git a/include/configs/ls2085ardb.h b/include/configs/ls2085ardb.h index f95d7b27320..26f74b63ade 100644 --- a/include/configs/ls2085ardb.h +++ b/include/configs/ls2085ardb.h @@ -250,7 +250,6 @@ unsigned long get_board_sys_clk(void); #ifdef CONFIG_FSL_DSPI #define CONFIG_CMD_SF #define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_BAR #endif diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 4194a0ff8bb..19ee5bc2f85 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -78,8 +78,6 @@ #define CONFIG_SUPPORT_RAW_INITRD /* ST M25P40 */ -#undef CONFIG_SPI_FLASH_MACRONIX -#define CONFIG_SPI_FLASH_STMICRO #undef CONFIG_ENV_SPI_MAX_HZ #define CONFIG_ENV_SPI_MAX_HZ 25000000 #undef CONFIG_SF_DEFAULT_SPEED diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 405a871c1a6..8063a1e4569 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -123,7 +123,6 @@ /* SPI FLASH */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 40000000 diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index 3c4beeba7c0..da49243ebfa 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -47,8 +47,6 @@ /* SPI NOR flash default params, used by sf commands */ #define CONFIG_SF_DEFAULT_SPEED 1000000 #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SPI_FLASH_SPANSION /* Environment in SPI NOR flash */ #define CONFIG_ENV_IS_IN_SPI_FLASH diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 9bd5eda24d2..06f6ed1fc0c 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -175,7 +175,6 @@ # define CONFIG_SYS_NO_FLASH 1 # define CONFIG_SYS_SPI_BASE XILINX_SPI_FLASH_BASEADDR # define CONFIG_SPI 1 -# define CONFIG_SPI_FLASH_STMICRO 1 # define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 # define CONFIG_SF_DEFAULT_SPEED XILINX_SPI_FLASH_MAX_FREQ # define CONFIG_SF_DEFAULT_CS XILINX_SPI_FLASH_CS diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 95d356a0d40..1cb135b8ad0 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -29,7 +29,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MMC #define CONFIG_SDHCI diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 2071cf508a7..d12d725e5f6 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -123,7 +123,6 @@ * Common SPI Flash configuration */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_MACRONIX 1 #endif /* diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 10867a7b9dd..a52c8c90710 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -129,7 +129,6 @@ #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 /* this may vary and depends on the installed chip */ -#define CONFIG_SPI_FLASH_SST #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #endif diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 3e045ef7a64..29d1f913602 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -39,7 +39,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index ae395035423..69379246aaf 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -171,7 +171,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 546c3eb9239..0aec2960377 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -185,8 +185,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_SPANSION -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SYS_FSL_QSPI_LE #define CONFIG_SYS_FSL_QSPI_AHB #ifdef CONFIG_MX6SX_SABRESD_REVA diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 8663bc1e745..2712b27fd16 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -198,7 +198,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF #define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_BAR #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index 9160971a800..3416ce3321b 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -31,7 +31,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_SST #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 4b693e8230b..9464153f584 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -51,7 +51,6 @@ #define CONFIG_LCD_ALIGNMENT MMU_SECTION_SIZE /* SPI */ -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_CMD_SPI diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index c1f26c0a6c3..4633fec164d 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -102,8 +102,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SPI -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE #define CONFIG_SYS_SPI_CLK clk_get(DAVINCI_SPI1_CLKID) diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 426ec7246f7..3da454a35b2 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -23,10 +23,6 @@ /* SF Configs */ #define CONFIG_CMD_SF #define CONFIG_SPI -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SPI_FLASH_WINBOND -#define CONFIG_SPI_FLASH_MACRONIX -#define CONFIG_SPI_FLASH_SST #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index f7bd90d9bb4..60bedaa7265 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -710,7 +710,6 @@ #define CONFIG_HARD_SPI #if defined(CONFIG_SPI_FLASH) -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 #define CONFIG_SF_DEFAULT_MODE 0 diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index f2a713d0bee..fffe5c9df80 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -35,7 +35,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) /* SPI */ -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_CMD_SPI diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 94f8085ceb6..0dfcdb97e32 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -35,7 +35,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) /* SPI */ -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_CMD_SPI diff --git a/include/configs/p2571.h b/include/configs/p2571.h index a5de411121b..f3357d1e0d5 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -36,7 +36,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) /* SPI */ -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_CMD_SPI diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 64cfd81611a..45c140d03c0 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -97,7 +97,6 @@ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \ + (8 * 1024 * 1024)) -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index abb5fa2660e..b851bba25d9 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -101,7 +101,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF #define CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH_STMICRO #define FSL_QSPI_FLASH_SIZE (1 << 24) #define FSL_QSPI_FLASH_NUM 2 #define CONFIG_SYS_FSL_QSPI_LE diff --git a/include/configs/porter.h b/include/configs/porter.h index 59b14e90610..e34cd052555 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -43,7 +43,6 @@ /* FLASH */ #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_QUAD #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/pr1.h b/include/configs/pr1.h index f76e02325f3..2e5ce75629c 100644 --- a/include/configs/pr1.h +++ b/include/configs/pr1.h @@ -83,7 +83,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index d56886d9d70..4f30fcef37b 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -83,7 +83,6 @@ #define CONFIG_SPI #define CONFIG_CMD_SF #define CONFIG_CMD_SPI -#define CONFIG_SPI_FLASH_GIGADEVICE #define CONFIG_SF_DEFAULT_SPEED 20000000 #define CONFIG_CMD_I2C diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 61b4bdaab25..bd5f4eef084 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -80,7 +80,6 @@ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_SPEED 30000000 #endif diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index 139031d3076..52b4584aa69 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -40,7 +40,6 @@ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI #define CONFIG_ATMEL_SPI0 -#define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 30000000 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index cde549a2143..ce96a7c7e77 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -40,7 +40,6 @@ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI #define CONFIG_ATMEL_SPI0 -#define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 #define CONFIG_SF_DEFAULT_SPEED 30000000 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 1c75c383f9a..d3112e1760e 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -83,14 +83,6 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_SF_TEST #define CONFIG_CMD_SPI -#define CONFIG_SPI_FLASH_ATMEL -#define CONFIG_SPI_FLASH_EON -#define CONFIG_SPI_FLASH_GIGADEVICE -#define CONFIG_SPI_FLASH_MACRONIX -#define CONFIG_SPI_FLASH_SPANSION -#define CONFIG_SPI_FLASH_SST -#define CONFIG_SPI_FLASH_STMICRO -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_CMD_I2C #define CONFIG_I2C_EDID diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index f1f9ca86326..fc9d2461616 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -97,8 +97,6 @@ /* SPI */ #define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 -#define CONFIG_SPI_FLASH_STMICRO 1 -#define CONFIG_SPI_FLASH_MACRONIX 1 /* MMCIF */ #define CONFIG_MMC 1 diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index d7ed65b1889..31dd9843f8f 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -97,8 +97,6 @@ /* SPI */ #define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 -#define CONFIG_SPI_FLASH_STMICRO 1 -#define CONFIG_SPI_FLASH_MACRONIX 1 /* MMCIF */ #define CONFIG_MMC 1 diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index cf514b6f94b..26d70f4817d 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -98,7 +98,6 @@ /* SPI */ #define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 -#define CONFIG_SPI_FLASH_STMICRO 1 /* MMCIF */ #define CONFIG_MMC 1 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index ff4317b8565..eac72700c08 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -97,7 +97,6 @@ #define CONFIG_SPI #define CONFIG_OMAP3_SPI #define CONFIG_MTD_DEVICE -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED (75000000) diff --git a/include/configs/silk.h b/include/configs/silk.h index cd839aa63fa..93c3d0d97b2 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -43,7 +43,6 @@ /* FLASH */ #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_QUAD #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index e16bd6bfc74..b22e3b1ae9c 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -88,7 +88,6 @@ #define CONFIG_CMD_SPI #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_BAR /* * The base address is configurable in QSys, each board must specify the @@ -191,8 +190,6 @@ unsigned int cm_get_l4_sp_clk_hz(void); * QSPI support */ /* Enable multiple SPI NOR flash manufacturers */ -#define CONFIG_SPI_FLASH_STMICRO /* Micron/Numonyx flash */ -#define CONFIG_SPI_FLASH_SPANSION /* Spansion flash */ #ifndef CONFIG_SPL_BUILD #define CONFIG_SPI_FLASH_MTD #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/stout.h b/include/configs/stout.h index 87ea5309480..70fedf1d818 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -48,7 +48,6 @@ /* SPI */ #define CONFIG_SPI #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_QUAD #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 0e50ee4cd1d..14c6a9edf57 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -82,8 +82,6 @@ #define CONFIG_CQSPI_REF_CLK ((30/4)/2)*1000*1000 #define CONFIG_CMD_SPI -#define CONFIG_SPI_FLASH_STMICRO /* Micron/Numonyx flash */ -#define CONFIG_SPI_FLASH_WINBOND /* WINBOND */ #define CONFIG_CMD_SF #endif diff --git a/include/configs/taurus.h b/include/configs/taurus.h index a5e7090cb72..1d6f9c3429b 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -159,7 +159,6 @@ #define CONFIG_CMD_SPI #define CONFIG_CMD_SF #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH_STMICRO #define TAURUS_SPI_MASK (1 << 4) #define TAURUS_SPI_CS_PIN AT91_PIN_PA3 diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 96a8dbb48ca..a9e3e66a5c9 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -35,7 +35,6 @@ /* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_CMD_SPI diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index b5d2d2e1ccf..de45e71b8e6 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -74,7 +74,6 @@ #endif /* SPI Configuration */ -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_CLK clk_get_rate(KS2_CLK1_6) #define CONFIG_SF_DEFAULT_SPEED 30000000 diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 295e16303ca..31d77573c07 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -48,7 +48,6 @@ #define CONFIG_MXC_SPI /* SPI Flash */ -#define CONFIG_SPI_FLASH_STMICRO #define TQMA6_SPI_FLASH_SECTOR_SIZE SZ_64K diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 7fd0469d3eb..bdc5dc02ea2 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -22,7 +22,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_TRIMSLICE /* SPI */ -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_CMD_SPI #define CONFIG_CMD_SF diff --git a/include/configs/tseries.h b/include/configs/tseries.h index 4265b8a4ffa..93e34544cb5 100644 --- a/include/configs/tseries.h +++ b/include/configs/tseries.h @@ -266,7 +266,6 @@ MMCARGS #define CONFIG_OMAP3_SPI #define CONFIG_CMD_SPI #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_SPL_SPI_SUPPORT diff --git a/include/configs/venice2.h b/include/configs/venice2.h index a374cd94884..4a0b4483325 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -36,7 +36,6 @@ #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) /* SPI */ -#define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 #define CONFIG_CMD_SPI diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 4a26a893971..34df6f03529 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -99,7 +99,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_SPANSION #define FSL_QSPI_FLASH_SIZE (1 << 24) #define FSL_QSPI_FLASH_NUM 2 #define CONFIG_SYS_FSL_QSPI_LE diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 706d0de7547..65d50ca1798 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -164,9 +164,6 @@ /*----------------------------------------------------------------------- * FLASH configuration */ -#define CONFIG_SPI_FLASH_MACRONIX -#define CONFIG_SPI_FLASH_WINBOND -#define CONFIG_SPI_FLASH_GIGADEVICE #define CONFIG_SYS_NO_FLASH #define CONFIG_CMD_SF #define CONFIG_CMD_SF_TEST diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index e990512083e..6b8b9f83e9f 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -84,7 +84,6 @@ /* SPI */ #ifdef CONFIG_ZYNQ_SPI -# define CONFIG_SPI_FLASH_SST # define CONFIG_CMD_SF #endif diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index d10f1ddacaf..fa83ac7b15d 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -67,7 +67,6 @@ /* SPI */ #ifdef CONFIG_ZYNQ_SPI -# define CONFIG_SPI_FLASH_SST # define CONFIG_CMD_SF #endif @@ -75,9 +74,6 @@ #ifdef CONFIG_ZYNQ_QSPI # define CONFIG_SF_DEFAULT_SPEED 30000000 # define CONFIG_SPI_FLASH_ISSI -# define CONFIG_SPI_FLASH_SPANSION -# define CONFIG_SPI_FLASH_STMICRO -# define CONFIG_SPI_FLASH_WINBOND # define CONFIG_SPI_FLASH_BAR # define CONFIG_CMD_SF #endif |