[U-Boot] [PATCH 2/8] spi: Migrate CONFIG_SH_QSPI to Kconfig

Tuomas Tynkkynen tuomas at tuxera.com
Wed Feb 7 00:42:17 UTC 2018 

Signed-off-by: Tuomas Tynkkynen <tuomas at tuxera.com>
---
 configs/alt_defconfig        | 1 +
 configs/gose_defconfig       | 1 +
 configs/koelsch_defconfig    | 1 +
 configs/lager_defconfig      | 1 +
 configs/porter_defconfig     | 1 +
 configs/silk_defconfig       | 1 +
 configs/stout_defconfig      | 1 +
 drivers/spi/Kconfig          | 6 ++++++
 include/configs/alt.h        | 1 -
 include/configs/blanche.h    | 1 -
 include/configs/gose.h       | 1 -
 include/configs/koelsch.h    | 1 -
 include/configs/lager.h      | 1 -
 include/configs/porter.h     | 1 -
 include/configs/silk.h       | 1 -
 include/configs/stout.h      | 1 -
 scripts/config_whitelist.txt | 1 -
 17 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/configs/alt_defconfig b/configs/alt_defconfig
index 49f838e01a..58d849073a 100644
--- a/configs/alt_defconfig
+++ b/configs/alt_defconfig
@@ -32,6 +32,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 2c0fd0bee5..ea68887249 100644
--- a/configs/gose_defconfig
+++ b/configs/gose_defconfig
@@ -32,6 +32,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 65e96e69de..31993b0824 100644
--- a/configs/koelsch_defconfig
+++ b/configs/koelsch_defconfig
@@ -32,6 +32,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 e5a6244512..3acca7a5ab 100644
--- a/configs/lager_defconfig
+++ b/configs/lager_defconfig
@@ -32,6 +32,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 614ee608e7..13dd65d040 100644
--- a/configs/porter_defconfig
+++ b/configs/porter_defconfig
@@ -48,6 +48,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 81d449cb98..dc898eb370 100644
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -32,6 +32,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 99574c3134..fc5f3a24c3 100644
--- a/configs/stout_defconfig
+++ b/configs/stout_defconfig
@@ -32,6 +32,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 84fc705a04..f9926b01a3 100644
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -39,7 +39,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 4948bbb063..f2bbfca8b8 100755
--- a/include/configs/blanche.h
+++ b/include/configs/blanche.h
@@ -40,7 +40,6 @@
 #if !defined(CONFIG_MTD_NOR_FLASH)
 #define CONFIG_SYS_TEXT_BASE	0x40000000
 #define CONFIG_SPI
-#define CONFIG_SH_QSPI
 #define CONFIG_SH_QSPI_BASE	0xE6B10000
 #else
 #define CONFIG_SYS_TEXT_BASE		0x00000000
diff --git a/include/configs/gose.h b/include/configs/gose.h
index dcd2130080..dccea0962f 100644
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -40,7 +40,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 f1571a4576..ca644395f9 100644
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -40,7 +40,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 53b717f260..be7a35a3d0 100644
--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -40,7 +40,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 b0a4efc304..772b3a160a 100644
--- a/include/configs/porter.h
+++ b/include/configs/porter.h
@@ -40,7 +40,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 0ece76f799..51a8fe6c09 100644
--- a/include/configs/silk.h
+++ b/include/configs/silk.h
@@ -40,7 +40,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 0a02216cd5..a384b55d7b 100644
--- a/include/configs/stout.h
+++ b/include/configs/stout.h
@@ -43,7 +43,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 dabc171f1e..052031e1be 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1904,7 +1904,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
-- 
2.16.1

More information about the U-Boot mailing list