Commit a5dfabea19f961826509118513f833cea25797bb

Authored by Tuomas Tynkkynen
Committed by Tom Rini
1 parent 95d3877a58

spi: Migrate CONFIG_SH_QSPI to Kconfig

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

Showing 17 changed files with 13 additions and 9 deletions Side-by-side Diff

configs/alt_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_SH_ETHER=y
34 34 CONFIG_BAUDRATE=38400
35 35 CONFIG_SCIF_CONSOLE=y
  36 +CONFIG_SH_QSPI=y
36 37 CONFIG_USB=y
37 38 CONFIG_USB_EHCI_HCD=y
38 39 CONFIG_USB_STORAGE=y
configs/gose_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_SH_ETHER=y
34 34 CONFIG_BAUDRATE=38400
35 35 CONFIG_SCIF_CONSOLE=y
  36 +CONFIG_SH_QSPI=y
36 37 CONFIG_USB=y
37 38 CONFIG_USB_EHCI_HCD=y
38 39 CONFIG_USB_STORAGE=y
configs/koelsch_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_SH_ETHER=y
34 34 CONFIG_BAUDRATE=38400
35 35 CONFIG_SCIF_CONSOLE=y
  36 +CONFIG_SH_QSPI=y
36 37 CONFIG_USB=y
37 38 CONFIG_USB_EHCI_HCD=y
38 39 CONFIG_USB_STORAGE=y
configs/lager_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_SH_ETHER=y
34 34 CONFIG_BAUDRATE=38400
35 35 CONFIG_SCIF_CONSOLE=y
  36 +CONFIG_SH_QSPI=y
36 37 CONFIG_USB=y
37 38 CONFIG_USB_EHCI_HCD=y
38 39 CONFIG_USB_STORAGE=y
configs/porter_defconfig
... ... @@ -49,6 +49,7 @@
49 49 CONFIG_DM_REGULATOR_FIXED=y
50 50 CONFIG_DM_REGULATOR_GPIO=y
51 51 CONFIG_SCIF_CONSOLE=y
  52 +CONFIG_SH_QSPI=y
52 53 CONFIG_USB=y
53 54 CONFIG_DM_USB=y
54 55 CONFIG_USB_EHCI_HCD=y
configs/silk_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_SH_ETHER=y
34 34 CONFIG_BAUDRATE=38400
35 35 CONFIG_SCIF_CONSOLE=y
  36 +CONFIG_SH_QSPI=y
36 37 CONFIG_USB=y
37 38 CONFIG_USB_EHCI_HCD=y
38 39 CONFIG_USB_STORAGE=y
configs/stout_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_SH_ETHER=y
34 34 CONFIG_BAUDRATE=38400
35 35 CONFIG_SCIF_CONSOLE=y
  36 +CONFIG_SH_QSPI=y
36 37 CONFIG_USB=y
37 38 CONFIG_USB_EHCI_HCD=y
38 39 CONFIG_USB_STORAGE=y
... ... @@ -245,6 +245,12 @@
245 245 Enable the SuperH SPI controller driver. This driver can be used
246 246 on various SuperH SoCs, such as SH7757.
247 247  
  248 +config SH_QSPI
  249 + bool "Renesas Quad SPI driver"
  250 + help
  251 + Enable the Renesas Quad SPI controller driver. This driver can be
  252 + used on Renesas SoCs.
  253 +
248 254 config TI_QSPI
249 255 bool "TI QSPI driver"
250 256 help
include/configs/alt.h
... ... @@ -33,7 +33,6 @@
33 33  
34 34 /* FLASH */
35 35 #define CONFIG_SPI
36   -#define CONFIG_SH_QSPI
37 36 #define CONFIG_SPI_FLASH_QUAD
38 37  
39 38 /* SH Ether */
include/configs/blanche.h
... ... @@ -39,7 +39,6 @@
39 39 /* FLASH */
40 40 #if !defined(CONFIG_MTD_NOR_FLASH)
41 41 #define CONFIG_SPI
42   -#define CONFIG_SH_QSPI
43 42 #define CONFIG_SH_QSPI_BASE 0xE6B10000
44 43 #else
45 44 #define CONFIG_SYS_FLASH_CFI
include/configs/gose.h
... ... @@ -34,7 +34,6 @@
34 34  
35 35 /* FLASH */
36 36 #define CONFIG_SPI
37   -#define CONFIG_SH_QSPI
38 37  
39 38 /* SH Ether */
40 39 #define CONFIG_SH_ETHER_USE_PORT 0
include/configs/koelsch.h
... ... @@ -34,7 +34,6 @@
34 34  
35 35 /* FLASH */
36 36 #define CONFIG_SPI
37   -#define CONFIG_SH_QSPI
38 37  
39 38 /* SH Ether */
40 39 #define CONFIG_SH_ETHER_USE_PORT 0
include/configs/lager.h
... ... @@ -34,7 +34,6 @@
34 34  
35 35 /* SPI */
36 36 #define CONFIG_SPI
37   -#define CONFIG_SH_QSPI
38 37  
39 38 /* SH Ether */
40 39 #define CONFIG_SH_ETHER_USE_PORT 0
include/configs/porter.h
... ... @@ -34,7 +34,6 @@
34 34  
35 35 /* FLASH */
36 36 #define CONFIG_SPI
37   -#define CONFIG_SH_QSPI
38 37 #define CONFIG_SPI_FLASH_QUAD
39 38  
40 39 /* SH Ether */
include/configs/silk.h
... ... @@ -34,7 +34,6 @@
34 34  
35 35 /* FLASH */
36 36 #define CONFIG_SPI
37   -#define CONFIG_SH_QSPI
38 37 #define CONFIG_SPI_FLASH_QUAD
39 38  
40 39 /* SH Ether */
include/configs/stout.h
... ... @@ -37,7 +37,6 @@
37 37  
38 38 /* SPI */
39 39 #define CONFIG_SPI
40   -#define CONFIG_SH_QSPI
41 40 #define CONFIG_SPI_FLASH_QUAD
42 41  
43 42 /* SH Ether */
scripts/config_whitelist.txt
... ... @@ -1897,7 +1897,6 @@
1897 1897 CONFIG_SH_MMCIF
1898 1898 CONFIG_SH_MMCIF_ADDR
1899 1899 CONFIG_SH_MMCIF_CLK
1900   -CONFIG_SH_QSPI
1901 1900 CONFIG_SH_QSPI_BASE
1902 1901 CONFIG_SH_SCIF_CLK_FREQ
1903 1902 CONFIG_SH_SDHI_FREQ