summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-02-07 02:42:20 +0200
committerTom Rini <trini@konsulko.com>2018-02-13 23:01:44 -0500
commitbbdf38698ee5c96138868d563c6825cd48bb26dc (patch)
tree81a4c022b76d252b56333239425e836440de19a5
parent60e54562913f7a272a5483ed909cf9c740b606f6 (diff)
spi: Migrate CONFIG_MPC8XXX_SPI to Kconfig
Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
-rw-r--r--configs/MPC8349EMDS_defconfig1
-rw-r--r--configs/ids8313_defconfig1
-rw-r--r--drivers/spi/Kconfig5
-rw-r--r--include/configs/MPC8349EMDS.h1
-rw-r--r--include/configs/ids8313.h1
-rw-r--r--scripts/config_whitelist.txt1
6 files changed, 7 insertions, 3 deletions
diff --git a/configs/MPC8349EMDS_defconfig b/configs/MPC8349EMDS_defconfig
index 523b841e32..2132ee4ae0 100644
--- a/configs/MPC8349EMDS_defconfig
+++ b/configs/MPC8349EMDS_defconfig
@@ -17,4 +17,5 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_PHYLIB=y
# CONFIG_PCI is not set
CONFIG_SYS_NS16550=y
+CONFIG_MPC8XXX_SPI=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/ids8313_defconfig b/configs/ids8313_defconfig
index ccb84e45bb..ab4493d3e3 100644
--- a/configs/ids8313_defconfig
+++ b/configs/ids8313_defconfig
@@ -34,4 +34,5 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_PHYLIB=y
# CONFIG_PCI is not set
CONFIG_SYS_NS16550=y
+CONFIG_MPC8XXX_SPI=y
CONFIG_OF_LIBFDT=y
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index e7e1ccd73a..a16faa6dfb 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -263,6 +263,11 @@ config MPC8XX_SPI
help
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
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index dabab10548..a95f45c731 100644
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -330,7 +330,6 @@
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x69} }
/* SPI */
-#define CONFIG_MPC8XXX_SPI
#undef CONFIG_SOFT_SPI /* SPI bit-banged */
/* GPIOs. Used as SPI chip selects */
diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index 12eb07d1f7..0b5b4a5c75 100644
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -285,7 +285,6 @@
* SPI setup
*/
#ifdef CONFIG_HARD_SPI
-#define CONFIG_MPC8XXX_SPI
#define CONFIG_SYS_GPIO1_PRELIM
#define CONFIG_SYS_GPIO1_DIR 0x00000001
#define CONFIG_SYS_GPIO1_DAT 0x00000001
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 30db0572c7..b340fc12d9 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1368,7 +1368,6 @@ CONFIG_MPC83XX_PCI2
CONFIG_MPC85XX_FEC
CONFIG_MPC85XX_FEC_NAME
CONFIG_MPC85XX_PCI2
-CONFIG_MPC8XXX_SPI
CONFIG_MPC8xxx_DISABLE_BPTR
CONFIG_MPLL_FREQ
CONFIG_MP_CLK_FREQ