spi: Migrate CONFIG_SH_QSPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>

diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 6d2e12a26efaf48e11343a565a59b31fe2e8a205..172461a7f4b98d798812444c7aa24a8ca3728cc2 100644 (file)
--- 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

diff --git a/configs/gose_defconfig b/configs/gose_defconfig
index 22bc60013f760e91262ba7ed934cd67c3dade370..baa8d85e48f51d4376f45e44f4e921987d1c7fdf 100644 (file)
--- 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

diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig
index be46f728853232d41346c1211cd0993b1ffc6cf6..1246dde599fa87abc7a722111cf455173ff2ebed 100644 (file)
--- 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

diff --git a/configs/lager_defconfig b/configs/lager_defconfig
index debe7168cde84de2561c891e8b30145d66e6ed83..1ce7949d74162a8e37eaa08bbce559df3a4cb531 100644 (file)
--- 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

diff --git a/configs/porter_defconfig b/configs/porter_defconfig
index 3e3adba66ce51f0f26bd0c0b3958bedea8e0c34f..38501d0bf1ab65f335df44a63577a0aef5f6f621 100644 (file)
--- 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

diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index b01d19815c7bad4981c0e9a62a92ce7c660b054b..bba0ce76e76c1b9629a9e26301762046ba4c03b0 100644 (file)
--- 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

diff --git a/configs/stout_defconfig b/configs/stout_defconfig
index 1777bf904e66dacdc093962bde9f962366685b7f..fd7e2dc45358fd02670267ee4f8a91953e72b4c9 100644 (file)
--- 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

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 3d2cd2db0072d6c39e1a2fc9c58c0af476521907..a1f9373af151ff6f8cd5a4b7ff14a72ae341cb3f 100644 (file)
--- 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

diff --git a/include/configs/alt.h b/include/configs/alt.h
index 9a9e4d918b4c9507b32e739913059c08b4e5e4ad..f5e41db15673b6c3e1f14205e64fc96bfc1c261e 100644 (file)
--- 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 */

diff --git a/include/configs/blanche.h b/include/configs/blanche.h
index a3ebe6163ea3d32df7dbf8564de92a15363ddc64..506b783d34e6bf0e1488044b813be21a73493d17 100755 (executable)
--- 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

diff --git a/include/configs/gose.h b/include/configs/gose.h
index a2a24b6f2d70a51a289af2fd0d4be2c5f7253fc7..3531621910e011057ebc710ec75401a1d6444425 100644 (file)
--- 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

diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h
index 79587b807b4d065acf8a292960ba1d764ebe9149..4d093ded35f3a1cc068ca48c97eaeddc14715463 100644 (file)
--- 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

diff --git a/include/configs/lager.h b/include/configs/lager.h
index a3d35d402313d6111b1b1b5531fadbfda125a9ed..45a76f8010befcf94496b8242301ea813f9133f8 100644 (file)
--- 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

diff --git a/include/configs/porter.h b/include/configs/porter.h
index d293f06dd1e97fdb06e7b91e70372eebff878305..b4a317f724438ff5874f3099d72bf0a298393f99 100644 (file)
--- 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 */

diff --git a/include/configs/silk.h b/include/configs/silk.h
index fce4b2dca6a7fc4cdc3ca23a31434130c1ed0b09..5d85c0df932a1d24067ba63d0d22ac233c7c7d78 100644 (file)
--- 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 */

diff --git a/include/configs/stout.h b/include/configs/stout.h
index 3db46be66a075e03021d24c98b2ddd89a57255be..b81103e8a72dc248334f348ba8b9782bde6c9d9d 100644 (file)
--- 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 */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9626761ac7f54eea8200aba89b1ae16dfa5b3d10..c428712c012eeadc16838fbe5b50ec1a0ac2c976 100644 (file)
--- 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