spi: Migrate CONFIG_SH_QSPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
6 years ago · a5dfabea19
parent 95d3877a58
commit a5dfabea19
17 changed files with 13 additions and 9 deletions
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@ -49,6 +49,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@ -33,6 +33,7 @@ CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_BAUDRATE=38400
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SH_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@ -245,6 +245,12 @@ config SH_SPI
 	  Enable the SuperH SPI controller driver. This driver can be used
 	  on various SuperH SoCs, such as SH7757.

+config SH_QSPI
+	bool "Renesas Quad SPI driver"
+	help
+	  Enable the Renesas Quad SPI controller driver. This driver can be
+	  used on Renesas SoCs.
+
 config TI_QSPI
 	bool "TI QSPI driver"
 	help
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@ -33,7 +33,6 @@

 /* FLASH */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 #define CONFIG_SPI_FLASH_QUAD

 /* SH Ether */
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@ -39,7 +39,6 @@
 /* FLASH */
 #if !defined(CONFIG_MTD_NOR_FLASH)
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 #define CONFIG_SH_QSPI_BASE	0xE6B10000
 #else
 #define CONFIG_SYS_FLASH_CFI
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@ -34,7 +34,6 @@

 /* FLASH */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI

 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@ -34,7 +34,6 @@

 /* FLASH */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI

 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@ -34,7 +34,6 @@

 /* SPI */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI

 /* SH Ether */
 #define CONFIG_SH_ETHER_USE_PORT	0
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@ -34,7 +34,6 @@

 /* FLASH */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 #define CONFIG_SPI_FLASH_QUAD

 /* SH Ether */
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@ -34,7 +34,6 @@

 /* FLASH */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 #define CONFIG_SPI_FLASH_QUAD

 /* SH Ether */
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@ -37,7 +37,6 @@

 /* SPI */
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 #define CONFIG_SPI_FLASH_QUAD

 /* SH Ether */
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -1897,7 +1897,6 @@ CONFIG_SH_I2C_DATA_LOW
 CONFIG_SH_MMCIF
 CONFIG_SH_MMCIF_ADDR
 CONFIG_SH_MMCIF_CLK
-CONFIG_SH_QSPI
 CONFIG_SH_QSPI_BASE
 CONFIG_SH_SCIF_CLK_FREQ
 CONFIG_SH_SDHI_FREQ