spi: Migrate CONFIG_MXC_SPI to Kconfig

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

diff --git a/README b/README
index 409e8f85b454ad7bb6b7c45fba68114849047976..d12cfcae63e4b47b8e1a99b272396b2cc198a809 100644 (file)
--- a/README
+++ b/README
@@ -2019,11 +2019,6 @@ The following options need to be configured:
                Currently supported on some MPC8xxx processors.  For an
                example, see include/configs/mpc8349emds.h.
 
-               CONFIG_MXC_SPI
-
-               Enables the driver for the SPI controllers on i.MX and MXC
-               SoCs. Currently i.MX31/35/51 are supported.
-
                CONFIG_SYS_SPI_MXC_WAIT
                Timeout for waiting until spi transfer completed.
                default: (CONFIG_SYS_HZ/100)     /* 10 ms */

diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index 3002fd4eb716d030ddf98ec76257b4b89c52f973..3f91d40923c16cadad41ff77f0cea6ab718925f8 100644 (file)
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -41,6 +41,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y

diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig
index 8d12c4bf223471666458a9ef3d5b5ffc3bbd720b..1f8c711c6951ee84073e1729901bdd5302da8217 100644 (file)
--- a/configs/aristainetos2b_defconfig
+++ b/configs/aristainetos2b_defconfig
@@ -41,6 +41,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y

diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index df15fbaf354ae41b84f841daff6ecc5dc257df9f..41b57bd415c1d4897da5b9b6b6976251bf1fac30 100644 (file)
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -39,6 +39,7 @@ CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_FASTMAP_AUTOCONVERT=1
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_VIDEO=y

diff --git a/configs/cgtqmx6eval_defconfig b/configs/cgtqmx6eval_defconfig
index 0d2e55538a7cb24caeae208129607afd4c289172..f7e168771bd9b99cf84eb675f69516363d238984 100644 (file)
--- a/configs/cgtqmx6eval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -50,6 +50,7 @@ CONFIG_DWC_AHSATA=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_SF=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/cl-som-imx7_defconfig b/configs/cl-som-imx7_defconfig
index 322d383748ec373bcdb7e85d2734bd65b106896e..aab2eb7383c3f657344fa342ccd0fdc7e3d7be1c 100644 (file)
--- a/configs/cl-som-imx7_defconfig
+++ b/configs/cl-som-imx7_defconfig
@@ -46,6 +46,7 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_MXC_USB_OTG_HACTIVE=y

diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 5b5280f59a329ffb8df034670dd7f10735f7241b..183ad4282ba526a8fc6ac57f709b33e298ee8e9f 100644 (file)
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -62,6 +62,7 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
 CONFIG_DM_PMIC=y
 CONFIG_DM_REGULATOR=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig
index 2d047e0eedb8605c9232fb973ed9daeca51b71d6..9fbc47ebdfb7d03f1f1b47d50d9067ede5247419 100644 (file)
--- a/configs/dh_imx6_defconfig
+++ b/configs/dh_imx6_defconfig
@@ -49,6 +49,7 @@ CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y

diff --git a/configs/display5_defconfig b/configs/display5_defconfig
index 494c5bca8d99685193764fbee8d384b52f36f678..5da6cbad6f7253a43d6d847b47e4eb25f1270711 100644 (file)
--- a/configs/display5_defconfig
+++ b/configs/display5_defconfig
@@ -60,3 +60,4 @@ CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_MXC_UART=y
+CONFIG_MXC_SPI=y

diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig
index aac50cca6499a4cbff7c2af376459691a5136abd..2ccdfdd1e4d2104703dd438a89154ee9f67b34a3 100644 (file)
--- a/configs/display5_factory_defconfig
+++ b/configs/display5_factory_defconfig
@@ -66,6 +66,7 @@ CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 # CONFIG_SPL_DM_SERIAL is not set
 CONFIG_MXC_UART=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Liebherr"

diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig
index d65b9a2e9fd945034a591bb37e176eded9f83ab4..107f0152cebefc91d0157240318ff3fad5fe2f40 100644 (file)
--- a/configs/dms-ba16-1g_defconfig
+++ b/configs/dms-ba16-1g_defconfig
@@ -33,6 +33,7 @@ CONFIG_DWC_AHSATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig
index eb39f04272c8b05d36a48d966728ede148996cc8..454a7d4cd39789db8dbe4c203818812f492d64ed 100644 (file)
--- a/configs/dms-ba16_defconfig
+++ b/configs/dms-ba16_defconfig
@@ -32,6 +32,7 @@ CONFIG_DWC_AHSATA=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/flea3_defconfig b/configs/flea3_defconfig
index 923d2acc6e40d2f66bcdf1e1e167a08749400b4b..50462b44c3d4b2af0b3232e1c561e2b3490a4e83 100644 (file)
--- a/configs/flea3_defconfig
+++ b/configs/flea3_defconfig
@@ -27,6 +27,7 @@ CONFIG_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FDT_FIXUP_PARTITIONS=y
 # CONFIG_EFI_LOADER is not set

diff --git a/configs/ge_b450v3_defconfig b/configs/ge_b450v3_defconfig
index 87312aea830e97ab86c28c49a60ccda7c1ffbb99..855e423bde7090bf3934f594aed46ae96fe8e5c1 100644 (file)
--- a/configs/ge_b450v3_defconfig
+++ b/configs/ge_b450v3_defconfig
@@ -30,5 +30,6 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_CMD_E1000=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

diff --git a/configs/ge_b650v3_defconfig b/configs/ge_b650v3_defconfig
index 64261531e9fed604315ed337f79a9ffaa32980cc..6d111155517b53cf31f134104d12b3b0a5a43785 100644 (file)
--- a/configs/ge_b650v3_defconfig
+++ b/configs/ge_b650v3_defconfig
@@ -30,5 +30,6 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_CMD_E1000=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

diff --git a/configs/ge_b850v3_defconfig b/configs/ge_b850v3_defconfig
index 0fada41d63901878562dfc793e32d8c3c9f2e157..12fdb3d56621ede25b2d61df74fa20f5bf4f45f3 100644 (file)
--- a/configs/ge_b850v3_defconfig
+++ b/configs/ge_b850v3_defconfig
@@ -30,5 +30,6 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_CMD_E1000=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

diff --git a/configs/imx31_phycore_eet_defconfig b/configs/imx31_phycore_eet_defconfig
index 80268bc23e3952b7869eddaa010cf3e5ef24e0e3..3438c9139a34ab4068e5b8652ffb34686d5a2562 100644 (file)
--- a/configs/imx31_phycore_eet_defconfig
+++ b/configs/imx31_phycore_eet_defconfig
@@ -20,4 +20,5 @@ CONFIG_NETDEVICES=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0xa8000000
 CONFIG_SMC911X_32_BIT=y
+CONFIG_MXC_SPI=y
 CONFIG_VIDEO=y

diff --git a/configs/marsboard_defconfig b/configs/marsboard_defconfig
index d00116ec2bb3014769f2469886ae5ee32029ea35..76b55df0c26ef52db0693213530eba3baf4be250 100644 (file)
--- a/configs/marsboard_defconfig
+++ b/configs/marsboard_defconfig
@@ -22,6 +22,7 @@ CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig
index f737886adb44549e2de02565c585675c61e4eb09..de1619c17e5771a414677e51ee40fb1a131bfec0 100644 (file)
--- a/configs/mccmon6_nor_defconfig
+++ b/configs/mccmon6_nor_defconfig
@@ -40,6 +40,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/mccmon6_sd_defconfig b/configs/mccmon6_sd_defconfig
index 822ed1df4da1f2edf34f97482c9b4f13ae8a9f58..fcad28ef255453e732ff6f734073659d4b971550 100644 (file)
--- a/configs/mccmon6_sd_defconfig
+++ b/configs/mccmon6_sd_defconfig
@@ -41,6 +41,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/mx31ads_defconfig b/configs/mx31ads_defconfig
index 699deb8772e738ba2a9d020dabfc5beb8d4bd312..c4538630c85c921213e14f10ecb71d10a4f61d70 100644 (file)
--- a/configs/mx31ads_defconfig
+++ b/configs/mx31ads_defconfig
@@ -11,3 +11,4 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MXC_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_MXC_SPI=y

diff --git a/configs/mx31pdk_defconfig b/configs/mx31pdk_defconfig
index a186a1289fc8e2638cab07d4bb0daa667cfa9d57..26650ef07ac147436e8ab84a42ac3ac6c5d58d4c 100644 (file)
--- a/configs/mx31pdk_defconfig
+++ b/configs/mx31pdk_defconfig
@@ -23,3 +23,4 @@ CONFIG_NETDEVICES=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0xB6000000
 CONFIG_SMC911X_32_BIT=y
+CONFIG_MXC_SPI=y

diff --git a/configs/mx35pdk_defconfig b/configs/mx35pdk_defconfig
index a9787ebe5a6024c228c3a944f947784e6b69916f..ac70e8eba08af36adaa68c114624967975a3cf48 100644 (file)
--- a/configs/mx35pdk_defconfig
+++ b/configs/mx35pdk_defconfig
@@ -31,6 +31,7 @@ CONFIG_NAND_MXC=y
 CONFIG_NETDEVICES=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0xB6000000
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig
index a35da5875a959cfbcd12e82b1a274a1bef95ba40..4eccf5114b54d3d616a8b9f443b3315bb84065b4 100644 (file)
--- a/configs/mx51evk_defconfig
+++ b/configs/mx51evk_defconfig
@@ -20,6 +20,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig
index 5b106a2f8c647a0040c39616c088d3fc44a456ba..bace60b65222c3df2c249e63ff1dfa5ab5b3ec2f 100644 (file)
--- a/configs/mx6qsabrelite_defconfig
+++ b/configs/mx6qsabrelite_defconfig
@@ -41,6 +41,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig
index 5dd0269a2c8bf6e9f6ceb21e6a01ffa4b46f14a5..5e512607371ddd854368431a298bc1eaf313b140 100644 (file)
--- a/configs/mx6sabreauto_defconfig
+++ b/configs/mx6sabreauto_defconfig
@@ -45,6 +45,7 @@ CONFIG_NAND_MXS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y

diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig
index ebc5b24fc82423f7f0b88bde270e0e6bf63ddde3..167c3f2bfc9c3dd1843fe35887c8c681324d6b90 100644 (file)
--- a/configs/mx6sabresd_defconfig
+++ b/configs/mx6sabresd_defconfig
@@ -53,6 +53,7 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
 CONFIG_PCI=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y

diff --git a/configs/mx6slevk_defconfig b/configs/mx6slevk_defconfig
index 4d9de653d7f07f6a012bd9c4204ee16d181d9d34..49ca1e68525a4200f1aacbcc02c3477663ba6de2 100644 (file)
--- a/configs/mx6slevk_defconfig
+++ b/configs/mx6slevk_defconfig
@@ -42,6 +42,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig
index 6370c8c4292740ff2958713e57ab0a78c1a93328..ddbdc4cb8b9303a88eafcf3350c273030acfc04d 100644 (file)
--- a/configs/mx6slevk_spinor_defconfig
+++ b/configs/mx6slevk_spinor_defconfig
@@ -42,6 +42,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

diff --git a/configs/mx6slevk_spl_defconfig b/configs/mx6slevk_spl_defconfig
index 1a0b6049267009b4bc2b3c7990158c930373eb20..85c05e7f31ea70156d80dc22daadd3b1793abfeb 100644 (file)
--- a/configs/mx6slevk_spl_defconfig
+++ b/configs/mx6slevk_spl_defconfig
@@ -50,6 +50,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_DM_USB=y

diff --git a/configs/nitrogen6dl2g_defconfig b/configs/nitrogen6dl2g_defconfig
index 37418480d1ad8d699cc1e7e7daed9ab9d116adce..28c6ee45bc050c1f177eda46f1f88f4716ea2d15 100644 (file)
--- a/configs/nitrogen6dl2g_defconfig
+++ b/configs/nitrogen6dl2g_defconfig
@@ -38,6 +38,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/nitrogen6dl_defconfig b/configs/nitrogen6dl_defconfig
index f0b8c04e19e92534fd1379251e59d35dc8e14fee..c54069fd81b6a2f37748203be6aa56be1a8e2f23 100644 (file)
--- a/configs/nitrogen6dl_defconfig
+++ b/configs/nitrogen6dl_defconfig
@@ -38,6 +38,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/nitrogen6q2g_defconfig b/configs/nitrogen6q2g_defconfig
index a1b3e8eb7132c7b88e7543471547f44a3908ac34..fa68b53196670abda80080b98520cd049cae0342 100644 (file)
--- a/configs/nitrogen6q2g_defconfig
+++ b/configs/nitrogen6q2g_defconfig
@@ -40,6 +40,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/nitrogen6q_defconfig b/configs/nitrogen6q_defconfig
index b382580ae53ac41297624ef8b6b8f8dbbd998f80..2f73f909777adcc80eccfff61f4cf390a807a964 100644 (file)
--- a/configs/nitrogen6q_defconfig
+++ b/configs/nitrogen6q_defconfig
@@ -40,6 +40,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index bc7afc0411cb46d6130322d53a117ba6e95c8fb5..0dc208928f1b6464006c378081d8e018e354ec77 100644 (file)
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -38,6 +38,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index 2d93f76e04a474396bfb8c0b92c73e2b04a6f046..a5b8d8f15f2ed599e518baadbda9fc7a29c83f38 100644 (file)
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -38,6 +38,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/ot1200_defconfig b/configs/ot1200_defconfig
index 261e946f8c8ad1cf446c53ab5cdcec8259915c95..739365f3a8639b6abd1a9798b6e8981c5fcc0bc5 100644 (file)
--- a/configs/ot1200_defconfig
+++ b/configs/ot1200_defconfig
@@ -33,6 +33,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/ot1200_spl_defconfig b/configs/ot1200_spl_defconfig
index d83946fef0217c26f942cda4ec99ef6eca64b416..98314d78607e96ce47a93ccc5eddefffa51f82ff 100644 (file)
--- a/configs/ot1200_spl_defconfig
+++ b/configs/ot1200_spl_defconfig
@@ -41,6 +41,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/pcm058_defconfig b/configs/pcm058_defconfig
index 2a174ff4cd3bff224df18b61b39ef68d1c64df4b..14626c359315e8a18da21e87b375dfc89f724bbc 100644 (file)
--- a/configs/pcm058_defconfig
+++ b/configs/pcm058_defconfig
@@ -56,5 +56,6 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig
index 488cf087fdce5dda3bb21cd523c25893ab6194ea..09efbcf03ba3616933cd5ee0323c90446ef88848 100644 (file)
--- a/configs/pfla02_defconfig
+++ b/configs/pfla02_defconfig
@@ -56,5 +56,6 @@ CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/riotboard_defconfig b/configs/riotboard_defconfig
index 6c300d9b8c79bfc4c16c9ae6cecdf34dd18be910..dd7df839593d398dff318175167ba2c74cce58de 100644 (file)
--- a/configs/riotboard_defconfig
+++ b/configs/riotboard_defconfig
@@ -22,6 +22,7 @@ CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_DM_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/tqma6dl_mba6_mmc_defconfig b/configs/tqma6dl_mba6_mmc_defconfig
index ebacb6a491933a81707c035655d299810e1733f9..25c0f3f690fd2fa974229a50bf195d499a19d33b 100644 (file)
--- a/configs/tqma6dl_mba6_mmc_defconfig
+++ b/configs/tqma6dl_mba6_mmc_defconfig
@@ -35,6 +35,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

diff --git a/configs/tqma6dl_mba6_spi_defconfig b/configs/tqma6dl_mba6_spi_defconfig
index 94972bb4c252c100cebf7712e23a942c62b7c025..cdacac9bcde9ded16d83324a0cf4e27dc611977f 100644 (file)
--- a/configs/tqma6dl_mba6_spi_defconfig
+++ b/configs/tqma6dl_mba6_spi_defconfig
@@ -36,6 +36,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig
index 8cc2e8af2e35ca526902bac9fd64a336e68aca30..b01e502dd229b155809dc118168b24d6dbbbed51 100644 (file)
--- a/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -34,6 +34,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig
index 21041b2da33e984cf5c7474a3bee42ef2545a60c..fc471a6b24deaa991b14760f9829b884020d302d 100644 (file)
--- a/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -35,6 +35,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig
index 6b12e6e249a28b4b2f5f2f1ee43dea421f9beff2..ba1483fde617d49d5ffe5992495d7e4439e34b0a 100644 (file)
--- a/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -35,6 +35,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig
index 52ba14e0b60376ab0fe1a0e551cb783a27adf125..dafea444face0cad53cac0f1479d6699eb036294 100644 (file)
--- a/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -36,6 +36,7 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
 CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_NETDEVICES=y
+CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_HOST_ETHER=y

diff --git a/configs/ts4800_defconfig b/configs/ts4800_defconfig
index 98ceaf7d1a5fcdd952d69cac3c23dfd7d54d71a1..726014942ec806fb7e91aaff9f1b0fe156df298a 100644 (file)
--- a/configs/ts4800_defconfig
+++ b/configs/ts4800_defconfig
@@ -15,4 +15,5 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig
index fbc51785ed7b14d2b302aee9866f1bfbebca768d..175240d8e36de20f0dea7384d97c91694e641fe2 100644 (file)
--- a/configs/woodburn_defconfig
+++ b/configs/woodburn_defconfig
@@ -31,3 +31,4 @@ CONFIG_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
+CONFIG_MXC_SPI=y

diff --git a/configs/woodburn_sd_defconfig b/configs/woodburn_sd_defconfig
index ab6f48ec624e340613d58a8de1fbc6ef4670d35d..ed18f021fa36cb0157c77fc8d96512d32f24b412 100644 (file)
--- a/configs/woodburn_sd_defconfig
+++ b/configs/woodburn_sd_defconfig
@@ -42,3 +42,4 @@ CONFIG_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_PHYLIB=y
 CONFIG_PHY_MICREL=y
+CONFIG_MXC_SPI=y

diff --git a/configs/zc5202_defconfig b/configs/zc5202_defconfig
index 82769adbc806e878e16c6a1e731dcedcf53a1ba3..82e8fc33a8e19f8149a667996db50b8f01f0ffd4 100644 (file)
--- a/configs/zc5202_defconfig
+++ b/configs/zc5202_defconfig
@@ -31,4 +31,5 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PCI=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/zc5601_defconfig b/configs/zc5601_defconfig
index 82ded3c0f4aee34c39faa54c8903821ccbb57887..cd2f5216c9301deaf07e8605872544df62c9fa31 100644 (file)
--- a/configs/zc5601_defconfig
+++ b/configs/zc5601_defconfig
@@ -30,4 +30,5 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_PHYLIB=y
+CONFIG_MXC_SPI=y
 CONFIG_OF_LIBFDT=y

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 686105c0e27bf39163b02a2706e07eb2a368488a..e7e1ccd73a8782967912e0b01126c80ab64a3778 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -263,6 +263,12 @@ config MPC8XX_SPI
        help
          Enable support for SPI on MPC8XX
 
+config MXC_SPI
+       bool "MXC SPI Driver"
+       help
+         Enable the MXC SPI controller driver. This driver can be used
+         on various i.MX SoCs such as i.MX31/35/51/6/7.
+
 config MXS_SPI
        bool "MXS SPI Driver"
        help

diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 89d4eeeb837a5414a913349a60a509c79a9f9a8d..e7fb60b6605a6575ffde8e166f560ff2aa254204 100644 (file)
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -68,7 +68,6 @@
 
 /* Serial Flash */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          0
 #define CONFIG_SF_DEFAULT_CS           0
 #define CONFIG_SF_DEFAULT_SPEED        20000000

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 69de44a1dff30ab2c9694970079799087c59092d..e730601728a8718aece6ccf72c4453d8205d9c7c 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -33,7 +33,6 @@
 #define CONFIG_FEC_MXC_PHYADDR         0
 
 #define CONFIG_SPI_FLASH_MTD
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_SPEED                20000000
 #define CONFIG_SF_DEFAULT_MODE         SPI_MODE_0
 #define CONFIG_SYS_SPI_ST_ENABLE_WP_PIN

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index f49302603ca527ed45fce02397842157f801399f..afc0bae1679c9fe1fe9a566cfc7238658044fb50 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -38,7 +38,6 @@
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 #define CONFIG_SPI_FLASH_SST
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          0
 #define CONFIG_SF_DEFAULT_SPEED                20000000
 #define CONFIG_SF_DEFAULT_MODE         (SPI_MODE_0)

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 14c471228f6a55465525192ee611be2aa159632d..7d6f39f4da8bb5a9580b13f3ab14783390e60c4e 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -148,7 +148,6 @@
 
 /* SPI Flash support */
 #define CONFIG_SPI
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          0
 #define CONFIG_SF_DEFAULT_CS           0
 #define CONFIG_SF_DEFAULT_SPEED                20000000

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 39d166a119f2d678925541a19309cb2530ea8d14..72610d639783e1ff0fcc748ec879cd383b59beed 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -175,7 +175,6 @@
 
 /* SPI */
 #define CONFIG_SPI
-#define CONFIG_MXC_SPI
 
 /* NAND */
 #ifndef CONFIG_SPL_BUILD

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 277e89a94ddf206c169c77312dadd1d259e405fe..82bc511f6d14273a86fb81da088bcbc87cbf7068 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -89,7 +89,6 @@
 
 /* SPI Flash Configs */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          0
 #define CONFIG_SF_DEFAULT_CS           0
 #define CONFIG_SF_DEFAULT_SPEED                25000000

diff --git a/include/configs/display5.h b/include/configs/display5.h
index c41ab8b5e2ab6bd671022914c7439e743b5bd16b..9c8a836bc5b3ed8444676ada54ecc9f91dbac634 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -65,7 +65,6 @@
 
 /* SPI NOR Flash */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          1
 #define CONFIG_SF_DEFAULT_CS           (0 | (IMX_GPIO_NR(5, 29) << 8))
 #define CONFIG_SF_DEFAULT_SPEED                50000000

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 909981cf10199e183e67f61c4aa918758e03735b..89d3dffc9764c8f19af11a04e1491fed14583d64 100644 (file)
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -46,7 +46,6 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
 
 /* Commands */
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          3
 #define CONFIG_SF_DEFAULT_CS           0
 #define CONFIG_SF_DEFAULT_SPEED                20000000

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 08a29223b20c2178e3b192959f3bf72af9d66e26..1d9e33a8c9116dc9fe3c3aded2a0a6100eccc6a9 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -52,7 +52,6 @@
 #define CONFIG_PHY_ATHEROS
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          0
 #define CONFIG_SF_DEFAULT_CS           0
 #define CONFIG_SF_DEFAULT_SPEED                20000000

diff --git a/include/configs/flea3.h b/include/configs/flea3.h
index eaaaed91fe170220260513d9bc1585695c1508ab..95a1260445fb917fb2b041ac4b833deaf0d53ae8 100644 (file)
--- a/include/configs/flea3.h
+++ b/include/configs/flea3.h
@@ -46,7 +46,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
 #define CONFIG_SYS_SPD_BUS_NUM         2 /* I2C3 */
 #define CONFIG_SYS_MXC_I2C3_SLAVE      0xfe
-#define CONFIG_MXC_SPI
 
 /*
  * UART (console)

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 7caaa0fa232443a8739dbcdd0b52cf62cdcb1311..f1c3a51b208269fae7e49bbebda925ce3628e5ed 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -92,7 +92,6 @@
 
 /* Serial Flash */
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          0
 #define CONFIG_SF_DEFAULT_CS           0
 #define CONFIG_SF_DEFAULT_SPEED        20000000

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 6e994b5dc735df60c2a8c5845734e3c2678444af..4845c9fce52fb8b0beea1bd7374a7c4589a12f75 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -54,7 +54,6 @@
 
 /* SPI */
 #ifdef CONFIG_CMD_SF
-  #define CONFIG_MXC_SPI
   #define CONFIG_SPI_FLASH_MTD
   #define CONFIG_SPI_FLASH_BAR
   #define CONFIG_SF_DEFAULT_BUS              0

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index b2d65f19330af0d8d9a1d63b605ca2ffdd05a0f5..c5357244bd22a57061f0df7c8922cb0b5a9cb161 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -147,7 +147,6 @@
 /* EET platform additions */
 #ifdef CONFIG_TARGET_IMX31_PHYCORE_EET
 #define CONFIG_HARD_SPI
-#define CONFIG_MXC_SPI
 
 #define CONFIG_S6E63D6
 

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 0cb8b17fa33b9002f67f67e0f2c418110bc61765..ed5f53f59795c8afe2255caa9f5331b2ae000595 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_MEMTEST_START       0x10000000
 #define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
 
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS  2
 #define CONFIG_SF_DEFAULT_CS   0
 #define CONFIG_SF_DEFAULT_SPEED 25000000

diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 3fed10782b1791a0aee4fa8c58a5ca7f308aaa47..358095d17a10cc96360f4bf9cba18d4d6a80f9bd 100644 (file)
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -33,7 +33,6 @@
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 
 #define CONFIG_HARD_SPI                1
-#define CONFIG_MXC_SPI         1
 #define CONFIG_DEFAULT_SPI_BUS 1
 #define CONFIG_DEFAULT_SPI_MODE        (SPI_MODE_0 | SPI_CS_HIGH)
 

diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index c704e629736b6ca439fd0a01be0f30408331c3f9..f970d819d01835c95d7f1f35f1d127ad242fd2bc 100644 (file)
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -47,7 +47,6 @@
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 
 #define CONFIG_HARD_SPI
-#define CONFIG_MXC_SPI
 #define CONFIG_DEFAULT_SPI_BUS 1
 #define CONFIG_DEFAULT_SPI_MODE        (SPI_MODE_0 | SPI_CS_HIGH)
 

diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 7e000c0392772a4d330b6a9a9169330dec151d28..ca5f2fcd81f04bc68e549d704f121112708c1c26 100644 (file)
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -40,7 +40,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C1                /* enable I2C bus 1 */
 #define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
-#define CONFIG_MXC_SPI
 
 /*
  * PMIC Configs

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index b3e8b8c2d7d35d37c923c3c48e5096e1a63d470a..5541d26c079748106b36e45ee20db247f8918769 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -36,12 +36,6 @@
 #define CONFIG_MXC_UART
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 
-/*
- * SPI Configs
- * */
-
-#define CONFIG_MXC_SPI
-
 /* PMIC Controller */
 #define CONFIG_POWER
 #define CONFIG_POWER_SPI

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 8b37404bebeceb19be29dc1e7166520b43d72455..d976e77aef7fa83576ff086a2a7bf6538dce94d6 100644 (file)
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -31,7 +31,6 @@
 #define CONFIG_PHY_ATHEROS
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          0
 #define CONFIG_SF_DEFAULT_CS           0
 #define CONFIG_SF_DEFAULT_SPEED                20000000

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 9ddb1433ac2ccc0a51f192777fe206f28e06af09..aa2952084aa6e9567561dc4717a966d5eceb3ab1 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -148,7 +148,6 @@
 #endif
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          0
 #define CONFIG_SF_DEFAULT_CS           0
 #define CONFIG_SF_DEFAULT_SPEED                20000000

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 57cdfd4e2b177ffe0533d541a28082ce32de60d5..c73cfb7f7e0c6ca5261e2e4d0f0b8ec781d40089 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -25,7 +25,6 @@
 #define CONFIG_MXC_UART_BASE          UART2_BASE
 
 #ifdef CONFIG_CMD_SF
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS  0
 #define CONFIG_SF_DEFAULT_CS   0
 #define CONFIG_SF_DEFAULT_SPEED 25000000

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 051416eab87548ddd32e21cc3e7cb23727ef2d30..b2cbf91ddfafb910c80c5310973cd4ffcb5350cf 100644 (file)
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -21,7 +21,6 @@
 
 /* SF Configs */
 #define CONFIG_SPI
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS  2
 #define CONFIG_SF_DEFAULT_CS   0
 #define CONFIG_SF_DEFAULT_SPEED 25000000

diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index ec74ed74d76a99dc0db7bb7cc016cd876f4cd265..3ea04624f93d7edf673787326564c4d4994d017a 100644 (file)
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -44,7 +44,6 @@
 #define CONFIG_FEC_MXC_PHYADDR         3
 
 /* SPI Flash */
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          0
 #define CONFIG_SF_DEFAULT_CS           0
 #define CONFIG_SF_DEFAULT_SPEED                20000000

diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index 2001d5d7876d0f71cce015e9ddb9692d5250bd15..dc20b855a0d275124753aa86823438a2b6425a07 100644 (file)
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -41,7 +41,6 @@
 #define CONFIG_FEC_MXC_PHYADDR         3
 
 /* SPI Flash */
-#define CONFIG_MXC_SPI
 #define CONFIG_SF_DEFAULT_BUS          2
 #define CONFIG_SF_DEFAULT_CS           0
 #define CONFIG_SF_DEFAULT_SPEED                20000000

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 591802a16d0e05a3171e5fd78da388ee8b44f748..1a1f5e3e032832344ad9d3898008bb4dae9fa506 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -31,9 +31,6 @@
 
 #define CONFIG_MXC_UART
 
-/* SPI */
-#define CONFIG_MXC_SPI
-
 /* SPI Flash */
 
 #define TQMA6_SPI_FLASH_SECTOR_SIZE    SZ_64K

diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 4e99cdbb59eeb7c2e9cee4b778338002bcf13a5a..cb0b9ee489fdcce405fa0fa5984ef25b9003d3bf 100644 (file)
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -38,10 +38,4 @@
 #define CONFIG_SYS_BOOTCOUNT_ADDR      IRAM_BASE_ADDR
 #define CONFIG_SYS_BOOTCOUNT_BE
 
-/*
- * Remove all unused interfaces / commands that are defined in
- * the common header tqms6.h
- */
-#undef CONFIG_MXC_SPI
-
 #endif /* __CONFIG_TQMA6_WRU4_H */

diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h
index 3ee1477522057044c52959b60aca996053a86a78..e41dce302ca17694696940de82e0d4589af9d7f1 100644 (file)
--- a/include/configs/ts4800.h
+++ b/include/configs/ts4800.h
@@ -47,7 +47,6 @@
  * SPI Configs
  * */
 #define CONFIG_HARD_SPI /* puts SPI: ready */
-#define CONFIG_MXC_SPI /* driver for the SPI controllers*/
 
 /*
  * MMC Configs

diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h
index 5b94a3f6cfebf8b9c42be2f0968feab209b3e645..a81d934203a6d35c81c4a5f9cec352f919471e43 100644 (file)
--- a/include/configs/woodburn_common.h
+++ b/include/configs/woodburn_common.h
@@ -43,7 +43,6 @@
 #define CONFIG_SYS_I2C_MXC_I2C2                /* enable I2C bus 2 */
 #define CONFIG_SYS_I2C_MXC_I2C3                /* enable I2C bus 3 */
 #define CONFIG_SYS_SPD_BUS_NUM         0
-#define CONFIG_MXC_SPI
 
 /* PMIC Controller */
 #define CONFIG_POWER

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 275c20b39e0ab1e519b3e9f99e8d0dec4c044f30..30db0572c7d676f59b32790fb9ca4b802fc6c886 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1427,7 +1427,6 @@ CONFIG_MXC_MCI_REGS_BASE
 CONFIG_MXC_NAND_HWECC
 CONFIG_MXC_NAND_IP_REGS_BASE
 CONFIG_MXC_NAND_REGS_BASE
-CONFIG_MXC_SPI
 CONFIG_MXC_UART_BASE
 CONFIG_MXC_USB_FLAGS
 CONFIG_MXC_USB_PORT