UPSTREAM: spi: Migrate CONFIG_MPC8XXX_SPI to Kconfig

Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
(cherry picked from commit bbdf38698ee5c96138868d563c6825cd48bb26dc
Change-Id: I6c99c0696716c148a9f8a3255111b23749c78a6b
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
This commit is contained in:
Tuomas Tynkkynen 2018-02-07 02:42:20 +02:00 committed by Kever Yang
parent d851477aa1
commit cb90935401
6 changed files with 13 additions and 3 deletions

View File

@ -15,4 +15,5 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
# CONFIG_PCI is not set # CONFIG_PCI is not set
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_MPC8XXX_SPI=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

View File

@ -31,4 +31,5 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
# CONFIG_PCI is not set # CONFIG_PCI is not set
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_MPC8XXX_SPI=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y

View File

@ -278,6 +278,17 @@ config MPC8XX_SPI
help help
Enable support for SPI on MPC8XX Enable support for SPI on MPC8XX
config MPC8XXX_SPI
bool "MPC8XXX SPI Driver"
help
Enable support for SPI on the MPC8XXX PowerPC SoCs.
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 config MXS_SPI
bool "MXS SPI Driver" bool "MXS SPI Driver"
help help

View File

@ -333,7 +333,6 @@
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} } #define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* SPI */ /* SPI */
#define CONFIG_MPC8XXX_SPI
#undef CONFIG_SOFT_SPI /* SPI bit-banged */ #undef CONFIG_SOFT_SPI /* SPI bit-banged */
/* GPIOs. Used as SPI chip selects */ /* GPIOs. Used as SPI chip selects */

View File

@ -286,7 +286,6 @@
* SPI setup * SPI setup
*/ */
#ifdef CONFIG_HARD_SPI #ifdef CONFIG_HARD_SPI
#define CONFIG_MPC8XXX_SPI
#define CONFIG_SYS_GPIO1_PRELIM #define CONFIG_SYS_GPIO1_PRELIM
#define CONFIG_SYS_GPIO1_DIR 0x00000001 #define CONFIG_SYS_GPIO1_DIR 0x00000001
#define CONFIG_SYS_GPIO1_DAT 0x00000001 #define CONFIG_SYS_GPIO1_DAT 0x00000001

View File

@ -1452,7 +1452,6 @@ CONFIG_MPC83XX_PCI2
CONFIG_MPC85XX_FEC CONFIG_MPC85XX_FEC
CONFIG_MPC85XX_FEC_NAME CONFIG_MPC85XX_FEC_NAME
CONFIG_MPC85XX_PCI2 CONFIG_MPC85XX_PCI2
CONFIG_MPC8XXX_SPI
CONFIG_MPC8xxx_DISABLE_BPTR CONFIG_MPC8xxx_DISABLE_BPTR
CONFIG_MPLL_FREQ CONFIG_MPLL_FREQ
CONFIG_MPR2 CONFIG_MPR2