diff options
Diffstat (limited to 'include')
120 files changed, 0 insertions, 131 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 6b5aa1b9f2..884e522334 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -590,7 +590,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index ec4979634a..e2ad557c27 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -279,7 +279,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_FSL_ESPI /* eSPI - Enhanced SPI */ #ifdef CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 65a7067a03..869c195ecd 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -485,7 +485,6 @@ combinations. this should be removed later /* eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI /* SPI */ #ifdef CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index e737960c54..08aec84f39 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -432,7 +432,6 @@ /* eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_EON #define CONFIG_CMD_SF diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 04e52f22f8..fb5b4f5ecc 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -140,7 +140,6 @@ #define CONFIG_SYS_SBFHDR_SIZE 0x7 #ifdef CONFIG_CMD_SPI # define CONFIG_SYS_DSPI_CS2 -# define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_STMICRO # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index e40bbfd102..271ea3df4a 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -204,7 +204,6 @@ #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x7 #ifdef CONFIG_CMD_SPI -# define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_ATMEL # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index d26ad9125c..7a4a9457a5 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -151,7 +151,6 @@ #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x7 #ifdef CONFIG_CMD_SPI -# define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_STMICRO # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index b735a26f0c..f50374411a 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -182,7 +182,6 @@ #define CONFIG_HARD_SPI #define CONFIG_SYS_SBFHDR_SIZE 0x13 #ifdef CONFIG_CMD_SPI -# define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_STMICRO # define CONFIG_SYS_DSPI_CTAR0 (DSPI_CTAR_TRSZ(7) | \ diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 9b196ad2e4..771ea1e3ab 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -355,7 +355,6 @@ #ifdef CONFIG_MPC8XXX_SPI #define CONFIG_CMD_SPI #define CONFIG_USE_SPIFLASH -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #endif diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index f57afff3c4..30d8cdcd8f 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -50,7 +50,6 @@ #define CONFIG_MPC8536DS 1 #define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */ -#define CONFIG_SPI_FLASH 1 /* Has SPI Flash */ #define CONFIG_PCI 1 /* Enable PCI/PCIE */ #define CONFIG_PCI1 1 /* Enable PCI controller 1 */ #define CONFIG_PCIE1 1 /* PCIE controler 1 (slot 1) */ diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 37bb42b28f..09e670f6d1 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -680,7 +680,6 @@ extern unsigned long get_sdram_size(void); #if !defined(CONFIG_NAND) || !defined(CONFIG_NAND_SECBOOT) /* eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 0f5915daea..78ce4c0a9b 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -479,7 +479,6 @@ /* * eSPI - Enhanced SPI */ -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_HARD_SPI diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index c78a421ce5..a510b4c3bb 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -412,7 +412,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 0f8b61412a..2cad01c2fc 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -581,7 +581,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #ifndef CONFIG_SPL_BUILD #define CONFIG_SPI_FLASH_SST diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 5ada99f96a..8430f9741d 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -575,7 +575,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #if defined(CONFIG_T1024RDB) #define CONFIG_SPI_FLASH_STMICRO #elif defined(CONFIG_T1023RDB) diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 6cc4cdb82d..e28b8d58af 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -486,7 +486,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_SST #define CONFIG_SPI_FLASH_EON diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 262aeaf32f..7366457a37 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -516,7 +516,6 @@ * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_BAR #define CONFIG_CMD_SF diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index e80b0b5031..b2d2d832e0 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -15,7 +15,6 @@ #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #define CONFIG_MMC -#define CONFIG_SPI_FLASH #define CONFIG_USB_EHCI #if defined(CONFIG_PPC_T2080) #define CONFIG_T2080QDS diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index c5db4f3eb1..151007bebd 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -16,7 +16,6 @@ #define CONFIG_T2080RDB #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ #define CONFIG_MMC -#define CONFIG_SPI_FLASH #define CONFIG_USB_EHCI #define CONFIG_FSL_SATA_V2 diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index cfe6557caa..4edb3cb91f 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -402,7 +402,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index e38a6f7f73..b2207da0dc 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -616,7 +616,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index b9bbe340f3..bc2ca66eaa 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -47,7 +47,6 @@ #define CONFIG_ETHPRIME "eTSEC3" #ifndef CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH y #endif #define CONFIG_SYS_REDUNDAND_ENVIRONMENT @@ -89,7 +88,6 @@ #define CONFIG_ETHPRIME "eTSEC1" #ifndef CONFIG_SPI_FLASH -#define CONFIG_SPI_FLASH y #endif #define CONFIG_SYS_REDUNDAND_ENVIRONMENT diff --git a/include/configs/alt.h b/include/configs/alt.h index 646cb6102c..524da4280d 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -43,7 +43,6 @@ #define CONFIG_SPI #define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH #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 a5f1f06c22..4961180c3a 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -429,7 +429,6 @@ /* SPI flash. */ #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 0526bd4b3d..4ee7931b9f 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -201,7 +201,6 @@ /* SPI */ #undef CONFIG_OMAP3_SPI #define CONFIG_TI_QSPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_MACRONIX #define CONFIG_CMD_SF #define CONFIG_CMD_SPI diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index eb50639c53..dd012f1c3e 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -45,7 +45,6 @@ #define CONFIG_PHY_MICREL #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_MTD #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MXC_SPI diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index c44da1c19e..aec91da5df 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -97,7 +97,6 @@ /* DataFlash */ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_ENV_SPI_MODE SPI_MODE_3 diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 1a481b3fd1..c241dac82d 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -97,7 +97,6 @@ /* DataFlash */ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH #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 c4a69526e7..ac59014f1d 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -106,7 +106,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SYS_DCACHE_LINESZ 32 diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index 868ec3a6cf..77af772822 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -125,7 +125,6 @@ #define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SYS_DCACHE_LINESZ 32 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 490c53e92f..2e118d8929 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -579,7 +579,6 @@ DEFAULT_LINUX_BOOT_ENV \ /* SPI flash. */ #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 84541b9c6e..c403729a8e 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -55,7 +55,6 @@ /* SPI */ #define CONFIG_TEGRA20_SLINK #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h index 0b66cdbc01..dd6cb7a8ca 100644 --- a/include/configs/bf506f-ezkit.h +++ b/include/configs/bf506f-ezkit.h @@ -74,7 +74,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 /* -#define CONFIG_SPI_FLASH #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 0df463f5b6..b7ceba40cb 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -105,7 +105,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #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 0ac3a09406..d4f06f3b15 100644 --- a/include/configs/bf525-ucr2.h +++ b/include/configs/bf525-ucr2.h @@ -67,7 +67,6 @@ /* support for serial flash */ #define CONFIG_BFIN_SPI -#define CONFIG_SPI_FLASH #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_HZ 30000000 #define CONFIG_SPI_FLASH_EON diff --git a/include/configs/bf526-ezbrd.h b/include/configs/bf526-ezbrd.h index 83f57cdcf9..5767ac1bd7 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 #define CONFIG_SPI_FLASH_SST diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h index c2958e834e..1c5fc9e492 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 #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bf527-ezkit.h b/include/configs/bf527-ezkit.h index 32ac961b67..28b3760f69 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 #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bf527-sdp.h b/include/configs/bf527-sdp.h index b374ab5772..51814a677f 100644 --- a/include/configs/bf527-sdp.h +++ b/include/configs/bf527-sdp.h @@ -77,7 +77,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index 322705decb..4876169104 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -98,7 +98,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 /* #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL */ diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index 53b7ab51b8..530763d0af 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 #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bf537-pnav.h b/include/configs/bf537-pnav.h index 850c5164da..e922bd5637 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 #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index 2da5d29302..11338a58f3 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 #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index b5e59ffe04..f250cdbf0a 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -84,7 +84,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL diff --git a/include/configs/bf538f-ezkit.h b/include/configs/bf538f-ezkit.h index 3c82bf2701..b1d4f263ae 100644 --- a/include/configs/bf538f-ezkit.h +++ b/include/configs/bf538f-ezkit.h @@ -83,7 +83,6 @@ #define CONFIG_ENV_SPI_MAX_HZ 30000000 /* #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL */ diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index 53f655890f..c7b44ae427 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 #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/bf561-acvilon.h b/include/configs/bf561-acvilon.h index 299c4c29dc..6d3f690b90 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 #define CONFIG_SPI_FLASH_ATMEL diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h index 73f3bfe197..fc8378d09a 100644 --- a/include/configs/bf609-ezkit.h +++ b/include/configs/bf609-ezkit.h @@ -101,7 +101,6 @@ #define CONFIG_BFIN_SPI6XX #define CONFIG_ENV_SPI_MAX_HZ 25000000 #define CONFIG_SF_DEFAULT_SPEED 25000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ALL /* diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index 7f364cd649..99202b5ccb 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -52,7 +52,6 @@ /* SPI FLASH */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_BUS 2 diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h index ee526afab1..92bb573ddd 100644 --- a/include/configs/blackstamp.h +++ b/include/configs/blackstamp.h @@ -219,7 +219,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 #define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h index 27dccf65c4..ffa696933f 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 #define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/br4.h b/include/configs/br4.h index a44c18c66e..cbef809c5a 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 #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h index f8785dbafc..7fa6fcc326 100644 --- a/include/configs/cam_enc_4xx.h +++ b/include/configs/cam_enc_4xx.h @@ -75,7 +75,6 @@ /* SPI support */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index c76a426db8..96dfe07c0a 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -58,7 +58,6 @@ /* SPI */ #define CONFIG_TEGRA20_SLINK #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index a3908d0ef5..37963744db 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -167,7 +167,6 @@ /* SPI */ #define CONFIG_SPI #define CONFIG_MXC_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SPI_FLASH_EON #define CONFIG_SPI_FLASH_GIGADEVICE diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 9cab9fb8f9..b3cb72caf2 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -219,7 +219,6 @@ #define CONFIG_HARD_SPI #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_CMD_SF diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index bf765afc11..cb063a4514 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -408,7 +408,6 @@ * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h index ab5226b5fa..3505229800 100644 --- a/include/configs/da830evm.h +++ b/include/configs/da830evm.h @@ -123,7 +123,6 @@ #define CONFIG_ENV_SECT_SIZE 4096 #define CONFIG_SYS_NO_FLASH #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI0_BASE diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 37a485b0a9..e9a144d8d4 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -142,7 +142,6 @@ #define CONFIG_BAUDRATE 115200 /* Default baud rate */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_CMD_SF diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index e702a50380..89b6f23c93 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -53,7 +53,6 @@ /* SPI */ #define CONFIG_TEGRA114_SPI #define CONFIG_TEGRA114_SPI_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 24fe1231f1..63e22f12d6 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -123,7 +123,6 @@ /* SPI */ #undef CONFIG_OMAP3_SPI #define CONFIG_TI_QSPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_CMD_SPI diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index ea6e5c0329..5216cb5284 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -73,7 +73,6 @@ #endif #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH 1 #define CONFIG_HARD_SPI 1 #define CONFIG_KIRKWOOD_SPI 1 #define CONFIG_SPI_FLASH_MACRONIX 1 diff --git a/include/configs/ea20.h b/include/configs/ea20.h index 1e522c3b6b..9370708157 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 #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_DAVINCI_SPI #define CONFIG_SYS_SPI_BASE DAVINCI_SPI1_BASE diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 5dfd56ca21..f83449f2b1 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -68,7 +68,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 2b638bf733..c9dac4cdcf 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -60,7 +60,6 @@ /* 512kB DataFlash at NPCS0 */ #define CONFIG_SYS_MAX_DATAFLASH_BANKS 1 #define CONFIG_HAS_DATAFLASH -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_ATMEL_DATAFLASH_SPI #define CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 0xC0000000 diff --git a/include/configs/gose.h b/include/configs/gose.h index 04f0383cbe..f088649afd 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 #define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_SPANSION diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 6b8c82d2b8..902ec2c536 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -48,11 +48,8 @@ /* Driver Model */ #ifndef CONFIG_SPL_BUILD -#define CONFIG_DM #define CONFIG_DM_GPIO -#define CONFIG_DM_SERIAL #define CONFIG_DM_THERMAL -#define CONFIG_CMD_DM #endif /* GPIO */ diff --git a/include/configs/ima3-mx53.h b/include/configs/ima3-mx53.h index 71ca77a513..081a0549c0 100644 --- a/include/configs/ima3-mx53.h +++ b/include/configs/ima3-mx53.h @@ -63,7 +63,6 @@ #define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0 /* SPI FLASH - not used for environment */ -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 25000000 diff --git a/include/configs/ip04.h b/include/configs/ip04.h index a6aed5d65f..dd2a618a88 100644 --- a/include/configs/ip04.h +++ b/include/configs/ip04.h @@ -91,7 +91,6 @@ #define CONFIG_BFIN_SPI #define CONFIG_ENV_SPI_MAX_HZ 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #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 606e6b4c55..3bbff282df 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -43,7 +43,6 @@ /* SPI */ #define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */ #define CONFIG_TEGRA114_SPI_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 2ed0855fdd..851e2699e4 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -253,7 +253,6 @@ int get_scl(void); #define CONFIG_SYS_REDUNDAND_ENVIRONMENT -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO /* SPI bus claim MPP configuration */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 686d2f3285..ed942a0e06 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -299,7 +299,6 @@ int get_scl(void); * eSPI - Enhanced SPI */ #define CONFIG_FSL_ESPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_BAR /* 4 byte-addressing */ #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_SPANSION diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 61c015f3ca..ff948f963c 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 #define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_SPANSION diff --git a/include/configs/ks2_evm.h b/include/configs/ks2_evm.h index 036f2cb85a..559446a509 100644 --- a/include/configs/ks2_evm.h +++ b/include/configs/ks2_evm.h @@ -72,7 +72,6 @@ /* SPI Configuration */ #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_DAVINCI_SPI #define CONFIG_CMD_SPI diff --git a/include/configs/lager.h b/include/configs/lager.h index f121b9c9aa..546863ea48 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -44,7 +44,6 @@ #define CONFIG_SPI #define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index ca913b0671..14c239370f 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -417,7 +417,6 @@ unsigned long get_board_ddr_clk(void); #define FSL_QSPI_FLASH_NUM 2 #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 6b6f2ba676..0748e61675 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -260,7 +260,6 @@ #define FSL_QSPI_FLASH_NUM 2 #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #endif diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index eba1b2f7b4..ad7b996b12 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -127,7 +127,6 @@ /* SPI FLASH */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index db463c0b2e..faa13e330c 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -176,7 +176,6 @@ # define CONFIG_SYS_SPI_BASE XILINX_SPI_FLASH_BASEADDR # define CONFIG_XILINX_SPI 1 # define CONFIG_SPI 1 -# define CONFIG_SPI_FLASH 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 diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 51436da64e..0d7b34b2d8 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -121,7 +121,6 @@ * Common SPI Flash configuration */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH 1 #define CONFIG_SPI_FLASH_MACRONIX 1 #endif diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index bc0ae28557..976192feca 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -130,7 +130,6 @@ /* SPI Flash */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SF_DEFAULT_BUS 2 #define CONFIG_SF_DEFAULT_CS 0 /* this may vary and depends on the installed chip */ diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h index e3386ac52b..3f7e4bcef8 100644 --- a/include/configs/mx51_efikamx.h +++ b/include/configs/mx51_efikamx.h @@ -93,7 +93,6 @@ /* SPI FLASH */ #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_SF_DEFAULT_CS 1 #define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index c8c9f812f8..6c3c52e3e0 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -44,7 +44,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 4b5c637136..a7da111ee9 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -163,7 +163,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 63ec7c6e92..19f9e4438c 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -189,7 +189,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_BAR #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index beaa11932c..67a3c97f8b 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -36,7 +36,6 @@ #define CONFIG_CMD_SF #ifdef CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SST #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index b99d762761..dd549aa11a 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -55,7 +55,6 @@ /* SPI */ #define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */ #define CONFIG_TEGRA114_SPI_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 91a74138c5..eb3184bb7c 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -103,7 +103,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_DAVINCI_SPI diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 2bbf2b9a5f..fb58acf508 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -27,7 +27,6 @@ /* SF Configs */ #define CONFIG_CMD_SF #define CONFIG_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SPI_FLASH_MACRONIX diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index b51379e779..a585d70214 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -41,7 +41,6 @@ #define CONFIG_BOARDNAME "P1020RDB-PC" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1020 -#define CONFIG_SPI_FLASH #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 @@ -70,7 +69,6 @@ #define CONFIG_BOARDNAME "P1020RDB-PD" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1020 -#define CONFIG_SPI_FLASH #define CONFIG_VSC7385_ENET #define CONFIG_SLIC #define __SW_BOOT_MASK 0x03 @@ -97,7 +95,6 @@ #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1021 #define CONFIG_QE -#define CONFIG_SPI_FLASH #define CONFIG_VSC7385_ENET #define CONFIG_SYS_LBC_LBCR 0x00080000 /* Implement conversion of addresses in the LBC */ @@ -133,7 +130,6 @@ #define CONFIG_NAND_FSL_ELBC #define CONFIG_P1024 #define CONFIG_SLIC -#define CONFIG_SPI_FLASH #define __SW_BOOT_MASK 0xf3 #define __SW_BOOT_NOR 0x00 #define __SW_BOOT_SPI 0x08 @@ -148,7 +144,6 @@ #define CONFIG_P1025 #define CONFIG_QE #define CONFIG_SLIC -#define CONFIG_SPI_FLASH #define CONFIG_SYS_LBC_LBCR 0x00080000 /* Implement conversion of addresses in the LBC */ @@ -164,7 +159,6 @@ #define CONFIG_BOARDNAME "P2020RDB-PCA" #define CONFIG_NAND_FSL_ELBC #define CONFIG_P2020 -#define CONFIG_SPI_FLASH #define CONFIG_VSC7385_ENET #define __SW_BOOT_MASK 0x03 #define __SW_BOOT_NOR 0xc8 diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 45c2df6da0..d80cf32cbe 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 #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h index e3cb09e3d5..46699ff635 100644 --- a/include/configs/peach-pi.h +++ b/include/configs/peach-pi.h @@ -10,7 +10,6 @@ #define __CONFIG_PEACH_PI_H #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SPI_FLASH #define CONFIG_ENV_SPI_BASE 0x12D30000 #define FLASH_SIZE (0x4 << 20) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h index 3ee42ef2c8..c5c9e3aa38 100644 --- a/include/configs/peach-pit.h +++ b/include/configs/peach-pit.h @@ -10,7 +10,6 @@ #define __CONFIG_PEACH_PIT_H #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SPI_FLASH #define CONFIG_ENV_SPI_BASE 0x12D30000 #define FLASH_SIZE (0x4 << 20) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) diff --git a/include/configs/porter.h b/include/configs/porter.h index f85d39cfed..93673490fb 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -44,7 +44,6 @@ #define CONFIG_SPI #define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH #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 b9253b9684..3e4aab45f7 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 #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index d933a9e7c6..046891e247 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -78,7 +78,6 @@ #ifdef CONFIG_CMD_SF #define CONFIG_ATMEL_SPI -#define CONFIG_SPI_FLASH #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 5fb621ec85..e06dfc9a90 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 #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 546d7a3a9f..eadccc182a 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 #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SF_DEFAULT_BUS 0 #define CONFIG_SF_DEFAULT_CS 0 diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 3caa83ce09..01b9ddf1a8 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -81,7 +81,6 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_SF_TEST #define CONFIG_CMD_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_ATMEL #define CONFIG_SPI_FLASH_EON #define CONFIG_SPI_FLASH_GIGADEVICE diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index d7bc751eab..7e8565d519 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -102,7 +102,6 @@ /* SPI */ #define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO 1 #define CONFIG_SPI_FLASH_MACRONIX 1 diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index 2124e0f3dd..857b26f4b3 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -102,7 +102,6 @@ /* SPI */ #define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO 1 #define CONFIG_SPI_FLASH_MACRONIX 1 diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index fd6a1df48a..18569bda98 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -103,7 +103,6 @@ /* SPI */ #define CONFIG_SH_SPI 1 #define CONFIG_SH_SPI_BASE 0xfe002000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO 1 /* MMCIF */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index ac4cf688f4..b61f6a0277 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -102,7 +102,6 @@ #define CONFIG_SPI #define CONFIG_OMAP3_SPI #define CONFIG_MTD_DEVICE -#define CONFIG_SPI_FLASH #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 ccfcede1ea..b105f5af31 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -44,7 +44,6 @@ #define CONFIG_SPI #define CONFIG_SPI_FLASH_BAR #define CONFIG_SH_QSPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_QUAD #define CONFIG_SYS_NO_FLASH diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 08381e3418..e5655fce19 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -10,7 +10,6 @@ #define __CONFIG_SMDK_H #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SPI_FLASH #define CONFIG_ENV_SPI_BASE 0x12D30000 #define FLASH_SIZE (0x4 << 20) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h index 61f582f375..607877c95d 100644 --- a/include/configs/smdk5420.h +++ b/include/configs/smdk5420.h @@ -10,7 +10,6 @@ #define __CONFIG_SMDK5420_H #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SPI_FLASH #define CONFIG_ENV_SPI_BASE 0x12D30000 #define FLASH_SIZE (0x4 << 20) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) diff --git a/include/configs/snow.h b/include/configs/snow.h index a2fb3f9808..557f86c07c 100644 --- a/include/configs/snow.h +++ b/include/configs/snow.h @@ -10,7 +10,6 @@ #define __CONFIG_SNOW_H #define CONFIG_ENV_IS_IN_SPI_FLASH -#define CONFIG_SPI_FLASH #define CONFIG_ENV_SPI_BASE 0x12D30000 #define FLASH_SIZE (0x4 << 20) #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 5ba2f6a831..4c3366a7f1 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -81,7 +81,6 @@ #define CONFIG_CMD_SPI #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 30000000 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_BAR /* @@ -187,7 +186,6 @@ unsigned int cm_get_l4_sp_clk_hz(void); #ifdef CONFIG_OF_CONTROL /* QSPI is controlled via DT */ #define CONFIG_CADENCE_QSPI /* Enable multiple SPI NOR flash manufacturers */ -#define CONFIG_SPI_FLASH /* SPI flash subsystem */ #define CONFIG_SPI_FLASH_STMICRO /* Micron/Numonyx flash */ #define CONFIG_SPI_FLASH_SPANSION /* Spansion flash */ #define CONFIG_SPI_FLASH_MTD diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 2cf4558daa..cce4b7dc12 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -139,7 +139,6 @@ #define CONFIG_SPI #define CONFIG_CMD_SPI #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_ATMEL_SPI #define CONFIG_SPI_FLASH_STMICRO #define TAURUS_SPI_MASK (1 << 4) diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index cfee2c3b84..fa651c1c98 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -38,7 +38,6 @@ /* SPI */ #define CONFIG_TEGRA20_SLINK #define CONFIG_TEGRA_SLINK_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 00294f6d52..52d5ae606f 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -47,7 +47,6 @@ #define CONFIG_MXC_SPI /* SPI Flash */ -#define CONFIG_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 848ef33f20..2db38e5b93 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -24,7 +24,6 @@ /* SPI */ #define CONFIG_TEGRA20_SFLASH -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_CMD_SPI diff --git a/include/configs/tseries.h b/include/configs/tseries.h index cd8ba2b10e..6a1835efe6 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 #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/venice2.h b/include/configs/venice2.h index bfe5298bf5..1d9d053b35 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -40,7 +40,6 @@ /* SPI */ #define CONFIG_TEGRA114_SPI /* Compatible w/ Tegra114 SPI */ #define CONFIG_TEGRA114_SPI_CTRLS 6 -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index b81dfce7aa..0c867795d0 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -10,7 +10,6 @@ /* We use generic board and device manager for v8 Versatile Express */ #define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_DM #ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #ifndef CONFIG_SEMIHOSTING @@ -114,7 +113,6 @@ #endif /* !CONFIG_GICV3 */ /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_F_LEN 0x2000 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20)) /* Ethernet Configuration */ @@ -130,7 +128,6 @@ #endif /* PL011 Serial Configuration */ -#define CONFIG_DM_SERIAL #define CONFIG_BAUDRATE 115200 #define CONFIG_CONS_INDEX 0 #define CONFIG_PL01X_SERIAL diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index dde65ed988..dfe316a543 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -103,7 +103,6 @@ #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_SPANSION #define FSL_QSPI_FLASH_SIZE (1 << 24) #define FSL_QSPI_FLASH_NUM 2 diff --git a/include/configs/vision2.h b/include/configs/vision2.h index 41680c4caf..07cd72c54a 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -50,7 +50,6 @@ #define CONFIG_FSL_SF #define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_STMICRO /* diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 1917d87ac5..0481cf3c8a 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -192,7 +192,6 @@ * FLASH configuration */ #define CONFIG_ICH_SPI -#define CONFIG_SPI_FLASH #define CONFIG_SPI_FLASH_MACRONIX #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SPI_FLASH_GIGADEVICE diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 880d29ca71..ff419c3acd 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -76,7 +76,6 @@ /* SPI */ #ifdef CONFIG_ZYNQ_SPI -# define CONFIG_SPI_FLASH # 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 1a52e7d538..c7b3058c4e 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -68,7 +68,6 @@ /* SPI */ #ifdef CONFIG_ZYNQ_SPI -# define CONFIG_SPI_FLASH # define CONFIG_SPI_FLASH_SST # define CONFIG_CMD_SF #endif |