spi: Migrate CONFIG_MXS_SPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
7 years ago · 7b819b569e
parent a5dfabea19
commit 7b819b569e
9 changed files with 12 additions and 2 deletions
--- a/configs/bg0900_defconfig
+++ b/configs/bg0900_defconfig
@ -32,4 +32,5 @@ CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_MXS_SPI=y
 CONFIG_OF_LIBFDT=y
--- a/configs/m28evk_defconfig
+++ b/configs/m28evk_defconfig
@ -46,6 +46,7 @@ CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_MXS_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/mx28evk_auart_console_defconfig
+++ b/configs/mx28evk_auart_console_defconfig
@ -41,6 +41,7 @@ CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
+CONFIG_MXS_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/mx28evk_defconfig
+++ b/configs/mx28evk_defconfig
@ -41,6 +41,7 @@ CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
+CONFIG_MXS_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/mx28evk_nand_defconfig
+++ b/configs/mx28evk_nand_defconfig
@ -40,6 +40,7 @@ CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
+CONFIG_MXS_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/mx28evk_spi_defconfig
+++ b/configs/mx28evk_spi_defconfig
@ -40,6 +40,7 @@ CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
+CONFIG_MXS_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@ -263,6 +263,12 @@ config MPC8XX_SPI
 	help
 	  Enable support for SPI on MPC8XX

+config MXS_SPI
+	bool "MXS SPI Driver"
+	help
+	  Enable the MXS SPI controller driver. This driver can be used
+	  on the i.MX23 and i.MX28 SoCs.
+
 config OMAP3_SPI
 	bool "McSPI driver for OMAP"
 	help
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@ -147,7 +147,6 @@
 /* SPI */
 #ifdef CONFIG_CMD_SPI
 #define CONFIG_HARD_SPI
-#define CONFIG_MXS_SPI
 #define CONFIG_SPI_HALF_DUPLEX
 #endif

--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -1437,7 +1437,6 @@ CONFIG_MXS_AUART
 CONFIG_MXS_AUART_BASE
 CONFIG_MXS_GPIO
 CONFIG_MXS_OCOTP
-CONFIG_MXS_SPI
 CONFIG_MX_CYCLIC
 CONFIG_MY_OPTION
 CONFIG_NANDFLASH_SIZE