diff options
author | Bin Meng <bmeng.cn@gmail.com> | 2015-11-25 05:34:53 -0800 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-11-25 10:05:28 -0500 |
commit | e5d5d4474ace2136009139e264b8edf2cddb13cb (patch) | |
tree | 7be603c21b5a07d2c61d2288ae8fb2c9dfa4c07b /include | |
parent | 71cbed31f4f123708b8b3397cb166155c4a71f66 (diff) |
spi: Move SPI drivers to defconfig
There are already Kconfig options for SPI 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')
43 files changed, 0 insertions, 46 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 50a5751617..e8775c6d8c 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_FSL_ESPI #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 665cad7e1f..b3e7218272 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -273,7 +273,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_CMD_I2C -#define CONFIG_FSL_ESPI /* eSPI - Enhanced SPI */ #ifdef CONFIG_FSL_ESPI #define CONFIG_SPI_FLASH_SPANSION diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 79d8e3f056..ea99a5066e 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -478,7 +478,6 @@ combinations. this should be removed later * used for SLIC */ /* eSPI - Enhanced SPI */ -#define CONFIG_FSL_ESPI /* SPI */ #ifdef CONFIG_FSL_ESPI #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index e70506e4d4..ed335780bd 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -426,7 +426,6 @@ #define CONFIG_CMD_I2C /* eSPI - Enhanced SPI */ -#define CONFIG_FSL_ESPI #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_SPI_FLASH_EON #define CONFIG_CMD_SF diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index a58f4fc5e6..5c63f34a30 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -419,7 +419,6 @@ * eSPI - Enhanced SPI */ #define CONFIG_HARD_SPI -#define CONFIG_FSL_ESPI #if defined(CONFIG_SPI_FLASH) #define CONFIG_SPI_FLASH_SPANSION diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index e96d6dbc57..81e8757eac 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_FSL_ESPI #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 093f2e4453..4191736b3a 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -480,7 +480,6 @@ #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_HARD_SPI -#define CONFIG_FSL_ESPI #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index a1457145d1..f196ccf122 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_FSL_ESPI #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 d3185fc422..9cfd92f0e9 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -578,7 +578,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_FSL_ESPI #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 ed4ad9a9d2..2131591a0c 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -567,7 +567,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_FSL_ESPI #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 b373ef740c..6cf28d004d 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -482,7 +482,6 @@ unsigned long get_board_ddr_clk(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_FSL_ESPI #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 da78b90c5d..3ffbf17af1 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_FSL_ESPI #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 7aa916f52b..c0c8c09dec 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -550,7 +550,6 @@ unsigned long get_board_ddr_clk(void); * eSPI - Enhanced SPI */ #ifdef CONFIG_SPI_FLASH -#define CONFIG_FSL_ESPI #define CONFIG_SPI_FLASH_STMICRO #ifndef CONFIG_SPL_BUILD #define CONFIG_SPI_FLASH_SST diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index db581ae62f..bd275208c4 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_FSL_ESPI #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_BAR #define CONFIG_CMD_SF diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 4edb3cb91f..655b2029d1 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_FSL_ESPI #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 2cf1b4edbb..6d507914e0 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_FSL_ESPI #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 3936e203c4..03c790df21 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -379,7 +379,6 @@ * eSPI - Enhanced SPI */ #define CONFIG_HARD_SPI -#define CONFIG_FSL_ESPI #define CONFIG_SPI_FLASH_SST 1 #define CONFIG_SPI_FLASH_STMICRO 1 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 42e142580e..5bd89a23a1 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -219,7 +219,6 @@ /* SPI */ #undef CONFIG_OMAP3_SPI -#define CONFIG_TI_QSPI #define CONFIG_SPI_FLASH_MACRONIX #define CONFIG_CMD_SF #define CONFIG_CMD_SPI diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 1790f60092..326e73e57e 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -51,7 +51,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* SPI */ -#define CONFIG_TEGRA20_SLINK #define CONFIG_TEGRA_SLINK_CTRLS 6 #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index ce6b1582ef..6607ffc7f0 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -54,7 +54,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* SPI */ -#define CONFIG_TEGRA20_SLINK #define CONFIG_TEGRA_SLINK_CTRLS 6 #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 9135d6c624..708c79af97 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -270,7 +270,6 @@ #ifdef CONFIG_OF_CONTROL #define CONFIG_DM_SPI #define CONFIG_CMD_SPI -#define CONFIG_FSL_DSPI #endif #endif /* __CONFIG_H */ diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 6eb1b52f4f..af4676e992 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -215,7 +215,6 @@ * eSPI - Enhanced SPI */ #define CONFIG_HARD_SPI -#define CONFIG_FSL_ESPI #define CONFIG_SPI_FLASH_STMICRO diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 12ada71163..81fbfa843c 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -414,7 +414,6 @@ /* * eSPI - Enhanced SPI */ -#define CONFIG_FSL_ESPI #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_SF_DEFAULT_SPEED 10000000 diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 848cec4391..bc7cac4b90 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -279,7 +279,6 @@ /* * eSPI - Enhanced SPI */ -#define CONFIG_FSL_ESPI /* * General PCI diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index cb9544b49e..951697998f 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -135,7 +135,6 @@ /* SPI */ #undef CONFIG_OMAP3_SPI -#define CONFIG_TI_QSPI #define CONFIG_SPI_FLASH_SPANSION #define CONFIG_CMD_SF #define CONFIG_CMD_SPI diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 5d2b4f320e..1fe12b5374 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -129,7 +129,6 @@ /* SPI */ #ifdef CONFIG_SPI_FLASH -#define CONFIG_EXYNOS_SPI #define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_SPI_FLASH_WINBOND diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index a32c8bae72..e2cbbb11b8 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -296,7 +296,6 @@ int get_scl(void); /* * eSPI - Enhanced SPI */ -#define CONFIG_FSL_ESPI #define CONFIG_SPI_FLASH_BAR /* 4 byte-addressing */ #define CONFIG_SPI_FLASH_STMICRO #define CONFIG_SPI_FLASH_SPANSION diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index bf0614cc73..f1cc3b6f80 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -413,14 +413,12 @@ unsigned long get_board_ddr_clk(void); /* SPI */ #ifdef CONFIG_QSPI_BOOT /* QSPI */ -#define CONFIG_FSL_QSPI #define QSPI0_AMBA_BASE 0x40000000 #define FSL_QSPI_FLASH_SIZE (1 << 24) #define FSL_QSPI_FLASH_NUM 2 #define CONFIG_SPI_FLASH_SPANSION /* DSPI */ -#define CONFIG_FSL_DSPI /* DM SPI */ #if defined(CONFIG_FSL_DSPI) || defined(CONFIG_FSL_QSPI) diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index a5d5a3b0dc..206826b327 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -310,14 +310,12 @@ /* SPI */ #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) /* QSPI */ -#define CONFIG_FSL_QSPI #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_FSL_DSPI #define CONFIG_SPI_FLASH_ATMEL #endif diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index db3d4e550d..9bd5eda24d 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -174,7 +174,6 @@ #ifdef SPIFLASH # define CONFIG_SYS_NO_FLASH 1 # define CONFIG_SYS_SPI_BASE XILINX_SPI_FLASH_BASEADDR -# define CONFIG_XILINX_SPI 1 # define CONFIG_SPI 1 # define CONFIG_SPI_FLASH_STMICRO 1 # define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index edf7d3f93a..546c3eb923 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -182,7 +182,6 @@ #define CONFIG_CMD_TIME -#define CONFIG_FSL_QSPI #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 577963263e..8663bc1e74 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -195,7 +195,6 @@ #define CONFIG_CMD_CACHE #endif -#define CONFIG_FSL_QSPI #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF #define CONFIG_SPI_FLASH diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index 57e1c5fcba..f7bd90d9bb 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -708,7 +708,6 @@ * eSPI - Enhanced SPI */ #define CONFIG_HARD_SPI -#define CONFIG_FSL_ESPI #if defined(CONFIG_SPI_FLASH) #define CONFIG_SPI_FLASH_SPANSION diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index c7608c5a6b..77ba2d8bed 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -269,7 +269,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * eSPI - Enhanced SPI */ #define CONFIG_HARD_SPI -#define CONFIG_FSL_ESPI #if defined(CONFIG_PCI) /* diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 046ddb8516..abb5fa2660 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -97,7 +97,6 @@ #define CONFIG_PHY_MICREL /* QSPI Configs*/ -#define CONFIG_FSL_QSPI #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index e3445dd24e..4258dcb7f6 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -54,7 +54,6 @@ #undef CONFIG_INTEL_ICH6_GPIO /* SPI is not supported */ -#undef CONFIG_ICH_SPI #undef CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_IS_NOWHERE diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index f6808b5ba9..e16bd6bfc7 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -190,7 +190,6 @@ unsigned int cm_get_l4_sp_clk_hz(void); /* * QSPI support */ -#define CONFIG_CADENCE_QSPI /* Enable multiple SPI NOR flash manufacturers */ #define CONFIG_SPI_FLASH_STMICRO /* Micron/Numonyx flash */ #define CONFIG_SPI_FLASH_SPANSION /* Spansion flash */ @@ -213,7 +212,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void); /* * Designware SPI support */ -#define CONFIG_DESIGNWARE_SPI #define CONFIG_CMD_SPI /* diff --git a/include/configs/stv0991.h b/include/configs/stv0991.h index 1526d13ac1..0e50ee4cd1 100644 --- a/include/configs/stv0991.h +++ b/include/configs/stv0991.h @@ -78,7 +78,6 @@ + * QSPI support + */ #ifdef CONFIG_OF_CONTROL /* QSPI is controlled via DT */ -#define CONFIG_CADENCE_QSPI #define CONFIG_CQSPI_DECODER 0 #define CONFIG_CQSPI_REF_CLK ((30/4)/2)*1000*1000 #define CONFIG_CMD_SPI diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 32974249b0..96a8dbb48c 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -34,7 +34,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* SPI */ -#define CONFIG_TEGRA20_SLINK #define CONFIG_TEGRA_SLINK_CTRLS 6 #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 2ab5511632..7fd0469d3e 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_TEGRA20_SFLASH #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_CMD_SPI diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index a3ea2e0a1f..4a26a89397 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -96,7 +96,6 @@ #define CONFIG_PHY_MICREL /* QSPI Configs*/ -#define CONFIG_FSL_QSPI #ifdef CONFIG_FSL_QSPI #define CONFIG_CMD_SF diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 8be402d35d..706d0de754 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -164,7 +164,6 @@ /*----------------------------------------------------------------------- * FLASH configuration */ -#define CONFIG_ICH_SPI #define CONFIG_SPI_FLASH_MACRONIX #define CONFIG_SPI_FLASH_WINBOND #define CONFIG_SPI_FLASH_GIGADEVICE diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h index 63224dd744..dbc829e6e4 100644 --- a/include/configs/zynq_zc770.h +++ b/include/configs/zynq_zc770.h @@ -18,7 +18,6 @@ # define CONFIG_ZYNQ_GEM0 # define CONFIG_ZYNQ_GEM_PHY_ADDR0 7 # define CONFIG_ZYNQ_SDHCI0 -# define CONFIG_ZYNQ_SPI #elif defined(CONFIG_ZC770_XM011) |