[U-Boot] [PATCH v2 05/42] Convert CONFIG_CMD_MMC_SPI to Kconfig

[Simon Glass]

This converts the following to Kconfig:
   CONFIG_CMD_MMC_SPI

Signed-off-by: Simon Glass <sjg at chromium.org>
Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
---

Changes in v2:
- Sort Kconfig options in alphabetical order

 README                               | 1 -
 cmd/Kconfig                          | 9 +++++++++
 configs/UCP1020_SPIFLASH_defconfig   | 1 +
 configs/UCP1020_defconfig            | 1 +
 configs/microblaze-generic_defconfig | 1 +
 include/config_cmd_all.h             | 1 -
 include/configs/UCP1020.h            | 1 -
 include/configs/am335x_shc.h         | 1 -
 include/configs/microblaze-generic.h | 1 -
 scripts/config_whitelist.txt         | 2 --
 10 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README b/README
index ad83a81da9..8d635a1aaf 100644
--- a/README
+++ b/README
@@ -836,7 +836,6 @@ The following options need to be configured:
 		CONFIG_CMD_TIMER	* access to the system tick timer
 		CONFIG_CMD_USB		* USB support
 		CONFIG_CMD_CDP		* Cisco Discover Protocol support
-		CONFIG_CMD_MFSL		* Microblaze FSL support
 		CONFIG_CMD_XIMG		  Load part of Multi Image
 		CONFIG_CMD_UUID		* Generate random UUID or GUID string
 
diff --git a/cmd/Kconfig b/cmd/Kconfig
index d9a35b81a7..4b63efe80c 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -701,6 +701,15 @@ config CMD_NAND_TORTURE
 
 endif # CMD_NAND
 
+config CMD_MMC_SPI
+	bool "mmc_spi - Set up MMC SPI device"
+	help
+	  Provides a way to set up an MMC (Multimedia Card) SPI (Serial
+	  Peripheral Interface) device. The device provides a means of
+	  accessing an MMC device via SPI using a single data line, limited
+	  to 20MHz. It is useful since it reduces the amount of protocol code
+	  required.
+
 config CMD_PART
 	bool "part"
 	select PARTITION_UUIDS
diff --git a/configs/UCP1020_SPIFLASH_defconfig b/configs/UCP1020_SPIFLASH_defconfig
index 686137dc98..e871d6fdfc 100644
--- a/configs/UCP1020_SPIFLASH_defconfig
+++ b/configs/UCP1020_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_MMC_SPI=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
diff --git a/configs/UCP1020_defconfig b/configs/UCP1020_defconfig
index be0029673b..13af8626e7 100644
--- a/configs/UCP1020_defconfig
+++ b/configs/UCP1020_defconfig
@@ -19,6 +19,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_MMC_SPI=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 3d84cf24aa..f97459e6a8 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -23,6 +23,7 @@ CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="U-Boot-mONStR> "
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GPIO=y
+CONFIG_CMD_MFSL=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_DHCP=y
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index e6ebc2f57d..b3c0d0e71f 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -13,7 +13,6 @@
  * Alphabetical list of all possible commands.
  */
 
-#define CONFIG_CMD_MFSL		/* FSL support for Microblaze	*/
 #define CONFIG_CMD_ONENAND	/* OneNAND support		*/
 #define CONFIG_CMD_PCI		/* pciinfo			*/
 #define CONFIG_CMD_PCMCIA	/* PCMCIA support		*/
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 6fd3fa4712..eea518df21 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -437,7 +437,6 @@
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR	CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #define CONFIG_MMC_SPI
-#define CONFIG_CMD_MMC_SPI
 #endif
 
 /* Misc Extra Settings */
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index f3b7767a97..d21240c23c 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -19,7 +19,6 @@
 #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
 #undef CONFIG_CMD_EXT4
 #undef CONFIG_CMD_EXT4_WRITE
-#undef CONFIG_CMD_MMC_SPI
 #undef CONFIG_CMD_SPI
 
 #define CONFIG_CMD_CACHE
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index aa007e2819..fb0575fa4d 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -163,7 +163,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_MFSL
 
 #if defined(FLASH)
 # if !defined(RAMENV)
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b5662a9fd6..60d13dfbba 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -296,8 +296,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_MFSL
-CONFIG_CMD_MMC_SPI
 CONFIG_CMD_MTDPARTS_SPREAD
 CONFIG_CMD_ONENAND
 CONFIG_CMD_PCA953X
-- 
2.14.0.rc1.383.gd1ce394fe2-goog