qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: spi: Migrate CONFIG_MXS_SPI to Kconfig 

Change-Id: Id2769d0405f96348de67cdd24df8a82a35101637
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 7b819b569e92fd9b9b1baf160cd946a523fde1ce)
This commit is contained in:
Tuomas Tynkkynen 2018-02-07 02:42:18 +02:00 committed by Kever Yang
parent 3ad77667ab
commit d851477aa1
9 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/bg0900_defconfig
View File

@ -31,4 +31,5 @@ CONFIG_NAND_MXS=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_BAR=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_MXS_SPI=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

1
configs/m28evk_defconfig
View File

@ -44,6 +44,7 @@ CONFIG_NAND=y
CONFIG_NAND_MXS=y CONFIG_NAND_MXS=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_MXS_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

1
configs/mx28evk_auart_console_defconfig
View File

@ -40,6 +40,7 @@ CONFIG_NAND=y
CONFIG_NAND_MXS=y CONFIG_NAND_MXS=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_SST=y
CONFIG_MXS_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

1
configs/mx28evk_defconfig
View File

@ -40,6 +40,7 @@ CONFIG_NAND=y
CONFIG_NAND_MXS=y CONFIG_NAND_MXS=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_SST=y
CONFIG_MXS_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

1
configs/mx28evk_nand_defconfig
View File

@ -39,6 +39,7 @@ CONFIG_NAND=y
CONFIG_NAND_MXS=y CONFIG_NAND_MXS=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_SST=y
CONFIG_MXS_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

1
configs/mx28evk_spi_defconfig
View File

@ -39,6 +39,7 @@ CONFIG_NAND=y
CONFIG_NAND_MXS=y CONFIG_NAND_MXS=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_SST=y CONFIG_SPI_FLASH_SST=y
CONFIG_MXS_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

6
drivers/spi/Kconfig
View File

@ -278,6 +278,12 @@ config MPC8XX_SPI
help help
Enable support for SPI on MPC8XX Enable support for SPI on MPC8XX
config MXS_SPI
bool "MXS SPI Driver"
help
Enable the MXS SPI controller driver. This driver can be used
on the i.MX23 and i.MX28 SoCs.
config OMAP3_SPI config OMAP3_SPI
bool "McSPI driver for OMAP" bool "McSPI driver for OMAP"
help help

1
include/configs/mxs.h
View File

@ -149,7 +149,6 @@
/* SPI */ /* SPI */
#ifdef CONFIG_CMD_SPI #ifdef CONFIG_CMD_SPI
#define CONFIG_HARD_SPI #define CONFIG_HARD_SPI
#define CONFIG_MXS_SPI
#define CONFIG_SPI_HALF_DUPLEX #define CONFIG_SPI_HALF_DUPLEX
#endif #endif

1
scripts/config_whitelist.txt
View File

@ -1530,7 +1530,6 @@ CONFIG_MXS_AUART
CONFIG_MXS_AUART_BASE CONFIG_MXS_AUART_BASE
CONFIG_MXS_GPIO CONFIG_MXS_GPIO
CONFIG_MXS_OCOTP CONFIG_MXS_OCOTP
CONFIG_MXS_SPI
CONFIG_MX_CYCLIC CONFIG_MX_CYCLIC
CONFIG_MY_OPTION CONFIG_MY_OPTION
CONFIG_NANDFLASH_SIZE CONFIG_NANDFLASH_SIZE