diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 02:42:19 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-13 23:01:44 -0500 |
| commit | 60e54562913f7a272a5483ed909cf9c740b606f6 (patch) | |
| tree | 39d5c67ffebd97f769fbe1e172b1f67a0e4d142a | |
| parent | 7b819b569e92fd9b9b1baf160cd946a523fde1ce (diff) | |
| download | u-boot-60e54562913f7a272a5483ed909cf9c740b606f6.tar.gz | |
spi: Migrate CONFIG_MXC_SPI to Kconfig
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
82 files changed, 57 insertions, 46 deletions
@@ -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 3002fd4eb7..3f91d40923 100644 --- 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 8d12c4bf22..1f8c711c69 100644 --- 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 df15fbaf35..41b57bd415 100644 --- 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 0d2e55538a..f7e168771b 100644 --- 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 322d383748..aab2eb7383 100644 --- 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 5b5280f59a..183ad4282b 100644 --- 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 2d047e0eed..9fbc47ebdf 100644 --- 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 494c5bca8d..5da6cbad6f 100644 --- 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 aac50cca64..2ccdfdd1e4 100644 --- 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 d65b9a2e9f..107f0152ce 100644 --- 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 eb39f04272..454a7d4cd3 100644 --- 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 923d2acc6e..50462b44c3 100644 --- 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 87312aea83..855e423bde 100644 --- 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 64261531e9..6d11115551 100644 --- 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 0fada41d63..12fdb3d566 100644 --- 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 80268bc23e..3438c9139a 100644 --- 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 d00116ec2b..76b55df0c2 100644 --- 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 f737886adb..de1619c17e 100644 --- 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 822ed1df4d..fcad28ef25 100644 --- 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 699deb8772..c4538630c8 100644 --- 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 a186a1289f..26650ef07a 100644 --- 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 a9787ebe5a..ac70e8eba0 100644 --- 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 a35da5875a..4eccf5114b 100644 --- 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 5b106a2f8c..bace60b652 100644 --- 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 5dd0269a2c..5e51260737 100644 --- 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 ebc5b24fc8..167c3f2bfc 100644 --- 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 4d9de653d7..49ca1e6852 100644 --- 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 6370c8c429..ddbdc4cb8b 100644 --- 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 1a0b604926..85c05e7f31 100644 --- 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 37418480d1..28c6ee45bc 100644 --- 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 f0b8c04e19..c54069fd81 100644 --- 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 a1b3e8eb71..fa68b53196 100644 --- 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 b382580ae5..2f73f90977 100644 --- 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 bc7afc0411..0dc208928f 100644 --- 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 2d93f76e04..a5b8d8f15f 100644 --- 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 261e946f8c..739365f3a8 100644 --- 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 d83946fef0..98314d7860 100644 --- 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 2a174ff4cd..14626c3593 100644 --- 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 488cf087fd..09efbcf03b 100644 --- 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 6c300d9b8c..dd7df83959 100644 --- 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 ebacb6a491..25c0f3f690 100644 --- 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 94972bb4c2..cdacac9bcd 100644 --- 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 8cc2e8af2e..b01e502dd2 100644 --- 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 21041b2da3..fc471a6b24 100644 --- 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 6b12e6e249..ba1483fde6 100644 --- 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 52ba14e0b6..dafea444fa 100644 --- 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 98ceaf7d1a..726014942e 100644 --- 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 fbc51785ed..175240d8e3 100644 --- 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 ab6f48ec62..ed18f021fa 100644 --- 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 82769adbc8..82e8fc33a8 100644 --- 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 82ded3c0f4..cd2f5216c9 100644 --- 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 686105c0e2..e7e1ccd73a 100644 --- 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 89d4eeeb83..e7fb60b660 100644 --- 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 69de44a1df..e730601728 100644 --- 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 f49302603c..afc0bae167 100644 --- 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 14c471228f..7d6f39f4da 100644 --- 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 39d166a119..72610d6397 100644 --- 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 277e89a94d..82bc511f6d 100644 --- 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 c41ab8b5e2..9c8a836bc5 100644 --- 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 909981cf10..89d3dffc97 100644 --- 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 08a29223b2..1d9e33a8c9 100644 --- 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 eaaaed91fe..95a1260445 100644 --- 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 7caaa0fa23..f1c3a51b20 100644 --- 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 6e994b5dc7..4845c9fce5 100644 --- 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 b2d65f1933..c5357244bd 100644 --- 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 0cb8b17fa3..ed5f53f597 100644 --- 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 3fed10782b..358095d17a 100644 --- 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 c704e62973..f970d819d0 100644 --- 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 7e000c0392..ca5f2fcd81 100644 --- 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 b3e8b8c2d7..5541d26c07 100644 --- 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 8b37404beb..d976e77aef 100644 --- 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 9ddb1433ac..aa2952084a 100644 --- 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 57cdfd4e2b..c73cfb7f7e 100644 --- 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 051416eab8..b2cbf91ddf 100644 --- 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 ec74ed74d7..3ea04624f9 100644 --- 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 2001d5d787..dc20b855a0 100644 --- 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 591802a16d..1a1f5e3e03 100644 --- 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 4e99cdbb59..cb0b9ee489 100644 --- 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 3ee1477522..e41dce302c 100644 --- 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 5b94a3f6cf..a81d934203 100644 --- 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 275c20b39e..30db0572c7 100644 --- 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 |