spi: Migrate CONFIG_KIRKWOOD_SPI to Kconfig

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

diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index efa4e7b6e24250222a860738f85d81381bce11c6..9d6ad5387c7c4ae610b0fdf47140819b34f87f86 100644 (file)
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/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

diff --git a/arch/arm/mach-mvebu/include/mach/config.h b/arch/arm/mach-mvebu/include/mach/config.h
index cfd095247055fa381f1cd20cae7a904fc11c9a55..a3b12eaa001c805a83f9fb69de9bb036f52216e5 100644 (file)
--- a/arch/arm/mach-mvebu/include/mach/config.h
+++ b/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

diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig
index a5ed3b20a63a68560affa7b27e182e1bfa8fc734..2359ad2ebecc4e266bc44d2f484e70fc018f1039 100644 (file)
--- a/configs/clearfog_defconfig
+++ b/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

diff --git a/configs/controlcenterdc_defconfig b/configs/controlcenterdc_defconfig
index e85dbd97c88d9caa48ea00535abbae0d612d06bd..893dc686a93c07433fa321c9058607c543b60149 100644 (file)
--- a/configs/controlcenterdc_defconfig
+++ b/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

diff --git a/configs/d2net_v2_defconfig b/configs/d2net_v2_defconfig
index 04ee46af0fc5bce25a524e557259831bd469920a..b346fa221aab367fcf8beb4fcc6bcd34a06d98e1 100644 (file)
--- a/configs/d2net_v2_defconfig
+++ b/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

diff --git a/configs/db-88f6720_defconfig b/configs/db-88f6720_defconfig
index 005cb689d15bef514465a0b7284a44584e6f2330..b3d06ae309c84fed094802e703587d7c7210a60c 100644 (file)
--- a/configs/db-88f6720_defconfig
+++ b/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

diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig
index c48a780c9483ebbf6f53e8e26d90a87a022652df..29c9a39f27b6bb53bf0c57e0d33560f2b3e7f1a3 100644 (file)
--- a/configs/db-88f6820-amc_defconfig
+++ b/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

diff --git a/configs/db-88f6820-gp_defconfig b/configs/db-88f6820-gp_defconfig
index 0138bd8e867d8d5b0253a3e2166fa4c7eea73af2..2beacdbcc9c5b1e8adf6add3dbf89f4349ef2176 100644 (file)
--- a/configs/db-88f6820-gp_defconfig
+++ b/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

diff --git a/configs/db-mv784mp-gp_defconfig b/configs/db-mv784mp-gp_defconfig
index 94fb38a3554a9b34f9d435bcd39fbbbfa8f7136f..cfe852f85227b25a3791c2f6901deae38fd9e073 100644 (file)
--- a/configs/db-mv784mp-gp_defconfig
+++ b/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

diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig
index 9f2698a89b9ba82118dd9efb1854924cd54d8570..e633173f633c213e918d0c70c29dcaae3627220a 100644 (file)
--- a/configs/dreamplug_defconfig
+++ b/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

diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig
index c4d76c137bcc81ec57ab3484abc22fff3135923a..ec41ab7b4700ed3cf4a288373d78560d4b9f8f4b 100644 (file)
--- a/configs/ds109_defconfig
+++ b/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

diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig
index ef55ff69b442c41d487a710cb4ede6bd771d98e4..5d1d6ab488852914077520cfff759f4c4becbc69 100644 (file)
--- a/configs/ds414_defconfig
+++ b/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

diff --git a/configs/inetspace_v2_defconfig b/configs/inetspace_v2_defconfig
index 47d3c9b7b42de9e0110ba38fe85658e0aacd8b66..405786b1565792d8ac29146b8154aa13bf883d61 100644 (file)
--- a/configs/inetspace_v2_defconfig
+++ b/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

diff --git a/configs/km_kirkwood_128m16_defconfig b/configs/km_kirkwood_128m16_defconfig
index 9fff51ed394a9c6be1e5f72d56cacbc10738f41a..96349e13ce0ddf8bc87dc9589b89d64244b8ed38 100644 (file)
--- a/configs/km_kirkwood_128m16_defconfig
+++ b/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

diff --git a/configs/km_kirkwood_defconfig b/configs/km_kirkwood_defconfig
index d2d1fc1625b7f30a01afa927d542b8a3f3129129..2fe005839689017c02c6792d0886509a95c15258 100644 (file)
--- a/configs/km_kirkwood_defconfig
+++ b/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

diff --git a/configs/km_kirkwood_pci_defconfig b/configs/km_kirkwood_pci_defconfig
index c35db87fe204a9d6e19bf21cb0de88e18868ef19..7504cbc2e3d4e6192b490625f4a397916d0bab53 100644 (file)
--- a/configs/km_kirkwood_pci_defconfig
+++ b/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

diff --git a/configs/kmcoge5un_defconfig b/configs/kmcoge5un_defconfig
index a1ad54ea2f2002f2f234ff42515b3a10b7dcf486..a905434b8de73afb63e322e78d2152cfd3aaa8f0 100644 (file)
--- a/configs/kmcoge5un_defconfig
+++ b/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

diff --git a/configs/kmnusa_defconfig b/configs/kmnusa_defconfig
index 8be4637ee11bca1ef1cd059339af43c693e9af33..9bd8688fbbcc596b2a4ac918ec8a74e6ff06e0da 100644 (file)
--- a/configs/kmnusa_defconfig
+++ b/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

diff --git a/configs/kmsugp1_defconfig b/configs/kmsugp1_defconfig
index ad4146ee02b59488de92083c48d099d0be4d69ec..3d592bcd8a1b8fd85bcb42d015bd8940c92acae2 100644 (file)
--- a/configs/kmsugp1_defconfig
+++ b/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

diff --git a/configs/kmsuv31_defconfig b/configs/kmsuv31_defconfig
index 84916677e42c9c7fbff1c35e6192dcf6407284d5..8eee1592585416ea4d8930bd52c352396a8bef20 100644 (file)
--- a/configs/kmsuv31_defconfig
+++ b/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

diff --git a/configs/lschlv2_defconfig b/configs/lschlv2_defconfig
index 47226b9db21bb13f69584335122bc9e1086c442f..e7ae460f170b534bf8544ab9e8a730c10e77be6b 100644 (file)
--- a/configs/lschlv2_defconfig
+++ b/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

diff --git a/configs/lsxhl_defconfig b/configs/lsxhl_defconfig
index d09c06bcc390580443b0295c306c0ecf608cb3e7..ee8d20af0f80c9632fe6bbbce6e20100af6d4e7a 100644 (file)
--- a/configs/lsxhl_defconfig
+++ b/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

diff --git a/configs/maxbcm_defconfig b/configs/maxbcm_defconfig
index 83fd4a40cbc837aed25f975123c89a54c6365701..b91c3edfd560c1c802e7e4dc8ad71c4fff7028f7 100644 (file)
--- a/configs/maxbcm_defconfig
+++ b/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

diff --git a/configs/mgcoge3un_defconfig b/configs/mgcoge3un_defconfig
index 6135118bf0beb03549c99bbc7ebe5e39192a1807..21bccf310650fb3fc187951ddf62f47ebf0d52cd 100644 (file)
--- a/configs/mgcoge3un_defconfig
+++ b/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

diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig
index cd43d02083f9816b08708e6f1a3cbd8ae403fdac..da67aad707df8a1c03d57a028ae5f8c88bb36cfb 100644 (file)
--- a/configs/mvebu_db_armada8k_defconfig
+++ b/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

diff --git a/configs/mvebu_mcbin-88f8040_defconfig b/configs/mvebu_mcbin-88f8040_defconfig
index 9caa07d77a22f4b63078558df70eb96515453d7f..e16a56e31a43b80f6130f60db7f2dae655d26981 100644 (file)
--- a/configs/mvebu_mcbin-88f8040_defconfig
+++ b/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

diff --git a/configs/net2big_v2_defconfig b/configs/net2big_v2_defconfig
index 9ae1f10707c8a53395cc1f3f4b334420b65599c7..a1132da9e0f18ce3f87a59bbc506447d622589df 100644 (file)
--- a/configs/net2big_v2_defconfig
+++ b/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

diff --git a/configs/netspace_lite_v2_defconfig b/configs/netspace_lite_v2_defconfig
index 80730ead82e403ce322b0aae51ef77be06523a70..5337ee1fdd7f7d063a9ec2c7be1476895f2ed474 100644 (file)
--- a/configs/netspace_lite_v2_defconfig
+++ b/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

diff --git a/configs/netspace_max_v2_defconfig b/configs/netspace_max_v2_defconfig
index f88533667ab5818792587c2807f2909793d85d39..8e2a502496dc84d90d3e5a68617bee6832b82d2d 100644 (file)
--- a/configs/netspace_max_v2_defconfig
+++ b/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

diff --git a/configs/netspace_mini_v2_defconfig b/configs/netspace_mini_v2_defconfig
index 76b09df373a933e35ce178f5e34f5b131d233333..1012beaef3f74512e5d88c166abfc2e30175bb94 100644 (file)
--- a/configs/netspace_mini_v2_defconfig
+++ b/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

diff --git a/configs/netspace_v2_defconfig b/configs/netspace_v2_defconfig
index 496fd495a04fceb713d90c94280a91dcec8495ad..238271e0406e179afa7500795df9ee71516c8cd6 100644 (file)
--- a/configs/netspace_v2_defconfig
+++ b/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

diff --git a/configs/portl2_defconfig b/configs/portl2_defconfig
index 1b27e4129b58716095287dcb99706c280ea1c031..a745574d923593ec00d35043c0a585de6709809f 100644 (file)
--- a/configs/portl2_defconfig
+++ b/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

diff --git a/configs/theadorable_debug_defconfig b/configs/theadorable_debug_defconfig
index 7c80744f7e785c54e69c6ebdeaf5269a191a5f75..cb88ac6f6050a3a2b736f8b276118b31192c5103 100644 (file)
--- a/configs/theadorable_debug_defconfig
+++ b/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

diff --git a/configs/turris_omnia_defconfig b/configs/turris_omnia_defconfig
index 6645bc8e89fdcdc74a7efdfdfc797019632ff7d9..1c2eef051f7dd48c55e81a19623774e325e1fe0f 100644 (file)
--- a/configs/turris_omnia_defconfig
+++ b/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

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 79cd54e10cb08a91d7a2ed61c05f13460a7f4989..21dd6e0969518bc723754e7c5490808bbb7dea87 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/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

diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
index 7a739e39d72fd0c1163414e3749acd50c0f024a0..c0f5b315500853fb2553ecba0038bc611bfc5d34 100644 (file)
--- a/include/configs/dreamplug.h
+++ b/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 */

diff --git a/include/configs/ds109.h b/include/configs/ds109.h
index a2c6837348d38893c35a88d55cefdb0c5d560cbf..0040fbb427fa5a1ddf5006849135db5ab4218811 100644 (file)
--- a/include/configs/ds109.h
+++ b/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 */

diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 22d4ba4ae1acf354d51db88aa1812e89e13d3b21..a6c992f0fc547ac92194ece99c91e2ea537ec07a 100644 (file)
--- a/include/configs/mvebu_armada-8k.h
+++ b/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
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 53583962cf7d2c7239c0ba9429e3e754d4f88587..214c9da34c48ccb06fe3bab24e0707f3ff43f8bb 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/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