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>
2015-11-25 05:34:53 -08:00
parent 71cbed31f4
commit e5d5d4474a
316 changed files with 278 additions and 51 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 */
--- 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

--- 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
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -279,7 +279,6 @@
 /*
 * eSPI - Enhanced SPI
 */
-#define CONFIG_FSL_ESPI

 /*
 * General PCI
--- 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
--- 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
--- 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
--- 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)
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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)
 /*
--- 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
--- 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

--- 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

 /*
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)