diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 02:42:17 +0200 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-02-13 23:00:47 -0500 |
commit | a5dfabea19f961826509118513f833cea25797bb (patch) | |
tree | 1bf1d51845008e31e146c555a22fec5795844823 | |
parent | 95d3877a5818cc3f149a9d443637ff145bbaaabb (diff) |
spi: Migrate CONFIG_SH_QSPI to Kconfig
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
-rw-r--r-- | configs/alt_defconfig | 1 | ||||
-rw-r--r-- | configs/gose_defconfig | 1 | ||||
-rw-r--r-- | configs/koelsch_defconfig | 1 | ||||
-rw-r--r-- | configs/lager_defconfig | 1 | ||||
-rw-r--r-- | configs/porter_defconfig | 1 | ||||
-rw-r--r-- | configs/silk_defconfig | 1 | ||||
-rw-r--r-- | configs/stout_defconfig | 1 | ||||
-rw-r--r-- | drivers/spi/Kconfig | 6 | ||||
-rw-r--r-- | include/configs/alt.h | 1 | ||||
-rwxr-xr-x | include/configs/blanche.h | 1 | ||||
-rw-r--r-- | include/configs/gose.h | 1 | ||||
-rw-r--r-- | include/configs/koelsch.h | 1 | ||||
-rw-r--r-- | include/configs/lager.h | 1 | ||||
-rw-r--r-- | include/configs/porter.h | 1 | ||||
-rw-r--r-- | include/configs/silk.h | 1 | ||||
-rw-r--r-- | include/configs/stout.h | 1 | ||||
-rw-r--r-- | scripts/config_whitelist.txt | 1 |
17 files changed, 13 insertions, 9 deletions
diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 6d2e12a26ef..172461a7f4b 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 22bc60013f7..baa8d85e48f 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 be46f728853..1246dde599f 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 debe7168cde..1ce7949d741 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 3e3adba66ce..38501d0bf1a 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 b01d19815c7..bba0ce76e76 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 1777bf904e6..fd7e2dc4535 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 3d2cd2db007..a1f9373af15 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 9a9e4d918b4..f5e41db1567 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 a3ebe6163ea..506b783d34e 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 a2a24b6f2d7..3531621910e 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 79587b807b4..4d093ded35f 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 a3d35d40231..45a76f8010b 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 d293f06dd1e..b4a317f7244 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 fce4b2dca6a..5d85c0df932 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 3db46be66a0..b81103e8a72 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 9626761ac7f..c428712c012 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 |