Browse Source

spi: Migrate CONFIG_KIRKWOOD_SPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Tuomas Tynkkynen 6 years ago
parent
commit
4a942f49b8
39 changed files with 38 additions and 6 deletions
  1. 0 1
      arch/arm/mach-kirkwood/include/mach/config.h
  2. 0 1
      arch/arm/mach-mvebu/include/mach/config.h
  3. 1 0
      configs/clearfog_defconfig
  4. 1 0
      configs/controlcenterdc_defconfig
  5. 1 0
      configs/d2net_v2_defconfig
  6. 1 0
      configs/db-88f6720_defconfig
  7. 1 0
      configs/db-88f6820-amc_defconfig
  8. 1 0
      configs/db-88f6820-gp_defconfig
  9. 1 0
      configs/db-mv784mp-gp_defconfig
  10. 1 0
      configs/dreamplug_defconfig
  11. 1 0
      configs/ds109_defconfig
  12. 1 0
      configs/ds414_defconfig
  13. 1 0
      configs/inetspace_v2_defconfig
  14. 1 0
      configs/km_kirkwood_128m16_defconfig
  15. 1 0
      configs/km_kirkwood_defconfig
  16. 1 0
      configs/km_kirkwood_pci_defconfig
  17. 1 0
      configs/kmcoge5un_defconfig
  18. 1 0
      configs/kmnusa_defconfig
  19. 1 0
      configs/kmsugp1_defconfig
  20. 1 0
      configs/kmsuv31_defconfig
  21. 1 0
      configs/lschlv2_defconfig
  22. 1 0
      configs/lsxhl_defconfig
  23. 1 0
      configs/maxbcm_defconfig
  24. 1 0
      configs/mgcoge3un_defconfig
  25. 1 0
      configs/mvebu_db_armada8k_defconfig
  26. 1 0
      configs/mvebu_mcbin-88f8040_defconfig
  27. 1 0
      configs/net2big_v2_defconfig
  28. 1 0
      configs/netspace_lite_v2_defconfig
  29. 1 0
      configs/netspace_max_v2_defconfig
  30. 1 0
      configs/netspace_mini_v2_defconfig
  31. 1 0
      configs/netspace_v2_defconfig
  32. 1 0
      configs/portl2_defconfig
  33. 1 0
      configs/theadorable_debug_defconfig
  34. 1 0
      configs/turris_omnia_defconfig
  35. 6 0
      drivers/spi/Kconfig
  36. 0 1
      include/configs/dreamplug.h
  37. 0 1
      include/configs/ds109.h
  38. 0 1
      include/configs/mvebu_armada-8k.h
  39. 0 1
      scripts/config_whitelist.txt

+ 0 - 1
arch/arm/mach-kirkwood/include/mach/config.h

@@ -61,7 +61,6 @@
  */
 #ifdef CONFIG_CMD_SF
 #define CONFIG_HARD_SPI			1
-#define CONFIG_KIRKWOOD_SPI		1
 #ifndef CONFIG_ENV_SPI_BUS
 # define CONFIG_ENV_SPI_BUS		0
 #endif

+ 0 - 1
arch/arm/mach-mvebu/include/mach/config.h

@@ -56,7 +56,6 @@
  * SPI Flash configuration
  */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_KIRKWOOD_SPI
 #ifndef CONFIG_ENV_SPI_BUS
 # define CONFIG_ENV_SPI_BUS		0
 #endif

+ 1 - 0
configs/clearfog_defconfig

@@ -45,6 +45,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y

+ 1 - 0
configs/controlcenterdc_defconfig

@@ -54,6 +54,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_TPM_ATMEL_TWI=y
 CONFIG_TPM_AUTH_SESSIONS=y
 CONFIG_TPM_FLUSH_RESOURCES=y

+ 1 - 0
configs/d2net_v2_defconfig

@@ -32,6 +32,7 @@ CONFIG_MVSATA_IDE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/db-88f6720_defconfig

@@ -47,6 +47,7 @@ CONFIG_DEBUG_UART_BASE=0xf1012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/db-88f6820-amc_defconfig

@@ -54,6 +54,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=200000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/db-88f6820-gp_defconfig

@@ -54,6 +54,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/db-mv784mp-gp_defconfig

@@ -52,6 +52,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/dreamplug_defconfig

@@ -25,6 +25,7 @@ CONFIG_MVSATA_IDE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/ds109_defconfig

@@ -21,6 +21,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_FS_EXT4=y

+ 1 - 0
configs/ds414_defconfig

@@ -46,6 +46,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/inetspace_v2_defconfig

@@ -32,6 +32,7 @@ CONFIG_MVSATA_IDE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/km_kirkwood_128m16_defconfig

@@ -30,5 +30,6 @@ CONFIG_ENV_IS_IN_EEPROM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/km_kirkwood_defconfig

@@ -30,5 +30,6 @@ CONFIG_ENV_IS_IN_EEPROM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/km_kirkwood_pci_defconfig

@@ -30,5 +30,6 @@ CONFIG_ENV_IS_IN_EEPROM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/kmcoge5un_defconfig

@@ -30,5 +30,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/kmnusa_defconfig

@@ -30,5 +30,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/kmsugp1_defconfig

@@ -30,5 +30,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/kmsuv31_defconfig

@@ -30,5 +30,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/lschlv2_defconfig

@@ -34,6 +34,7 @@ CONFIG_MVSATA_IDE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/lsxhl_defconfig

@@ -26,6 +26,7 @@ CONFIG_MVSATA_IDE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/maxbcm_defconfig

@@ -38,3 +38,4 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y

+ 1 - 0
configs/mgcoge3un_defconfig

@@ -30,5 +30,6 @@ CONFIG_ENV_IS_IN_EEPROM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/mvebu_db_armada8k_defconfig

@@ -56,6 +56,7 @@ CONFIG_DEBUG_UART_CLOCK=200000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y

+ 1 - 0
configs/mvebu_mcbin-88f8040_defconfig

@@ -60,6 +60,7 @@ CONFIG_DEBUG_UART_CLOCK=200000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y

+ 1 - 0
configs/net2big_v2_defconfig

@@ -32,6 +32,7 @@ CONFIG_MVSATA_IDE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/netspace_lite_v2_defconfig

@@ -32,6 +32,7 @@ CONFIG_MVSATA_IDE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/netspace_max_v2_defconfig

@@ -32,6 +32,7 @@ CONFIG_MVSATA_IDE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/netspace_mini_v2_defconfig

@@ -30,4 +30,5 @@ CONFIG_MVSATA_IDE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/netspace_v2_defconfig

@@ -32,6 +32,7 @@ CONFIG_MVSATA_IDE=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

+ 1 - 0
configs/portl2_defconfig

@@ -30,5 +30,6 @@ CONFIG_ENV_IS_IN_EEPROM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y

+ 1 - 0
configs/theadorable_debug_defconfig

@@ -57,6 +57,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/turris_omnia_defconfig

@@ -41,6 +41,7 @@ CONFIG_DEBUG_UART_BASE=0xd0012000
 CONFIG_DEBUG_UART_CLOCK=250000000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y
+CONFIG_KIRKWOOD_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_EHCI_HCD=y

+ 6 - 0
drivers/spi/Kconfig

@@ -257,6 +257,12 @@ config TI_QSPI
 	  Enable the TI Quad-SPI (QSPI) driver for DRA7xx and AM43xx evms.
 	  This driver support spi flash single, quad and memory reads.
 
+config KIRKWOOD_SPI
+	bool "Marvell Kirkwood SPI Driver"
+	help
+	  Enable support for SPI on various Marvell SoCs, such as
+	  Kirkwood and Armada 375.
+
 config LPC32XX_SSP
 	bool "LPC32XX SPI Driver"
 	help

+ 0 - 1
include/configs/dreamplug.h

@@ -37,7 +37,6 @@
 
 #ifdef CONFIG_CMD_SF
 #define CONFIG_HARD_SPI			1
-#define CONFIG_KIRKWOOD_SPI		1
 #define CONFIG_ENV_SPI_BUS		0
 #define CONFIG_ENV_SPI_CS		0
 #define CONFIG_ENV_SPI_MAX_HZ		50000000 /* 50 MHz */

+ 0 - 1
include/configs/ds109.h

@@ -40,7 +40,6 @@
 
 #ifdef CONFIG_CMD_SF
 #define CONFIG_HARD_SPI			1
-#define CONFIG_KIRKWOOD_SPI		1
 #define CONFIG_ENV_SPI_BUS		0
 #define CONFIG_ENV_SPI_CS		0
 #define CONFIG_ENV_SPI_MAX_HZ		50000000 /* 50 MHz */

+ 0 - 1
include/configs/mvebu_armada-8k.h

@@ -62,7 +62,6 @@
 /*
  * SPI Flash configuration
  */
-#define CONFIG_KIRKWOOD_SPI
 #define CONFIG_ENV_SPI_BUS		0
 #define CONFIG_ENV_SPI_CS		0
 

+ 0 - 1
scripts/config_whitelist.txt

@@ -1089,7 +1089,6 @@ CONFIG_KIRKWOOD_EGIGA_INIT
 CONFIG_KIRKWOOD_GPIO
 CONFIG_KIRKWOOD_PCIE_INIT
 CONFIG_KIRKWOOD_RGMII_PAD_1V8
-CONFIG_KIRKWOOD_SPI
 CONFIG_KIRQ_EN
 CONFIG_KM8321
 CONFIG_KMCOGE4