From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 7 Feb 2018 00:42:17 +0000 (+0200)
Subject: spi: Migrate CONFIG_SH_QSPI to Kconfig
X-Git-Tag: v2025.01-rc5-pxa1908~4884
X-Git-Url: http://git.dujemihanovic.xyz/%22bddb.css/static/git-logo.png?a=commitdiff_plain;h=a5dfabea19f961826509118513f833cea25797bb;p=u-boot.git

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 6d2e12a26e..172461a7f4 100644
--- 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 22bc60013f..baa8d85e48 100644
--- 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 be46f72885..1246dde599 100644
--- 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 debe7168cd..1ce7949d74 100644
--- 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 3e3adba66c..38501d0bf1 100644
--- 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 b01d19815c..bba0ce76e7 100644
--- 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 1777bf904e..fd7e2dc453 100644
--- 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 3d2cd2db00..a1f9373af1 100644
--- 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 9a9e4d918b..f5e41db156 100644
--- 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 a3ebe6163e..506b783d34 100755
--- 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 a2a24b6f2d..3531621910 100644
--- 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 79587b807b..4d093ded35 100644
--- 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 a3d35d4023..45a76f8010 100644
--- 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 d293f06dd1..b4a317f724 100644
--- 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 fce4b2dca6..5d85c0df93 100644
--- 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 3db46be66a..b81103e8a7 100644
--- 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 9626761ac7..c428712c01 100644
--- 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