[U-Boot] [PATCH 13/41] Convert CONFIG_CMD_PCMCIA to Kconfig

[Simon Glass]

This converts the following to Kconfig:
   CONFIG_CMD_PCMCIA

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 README                       | 1 -
 cmd/Kconfig                  | 8 ++++++++
 configs/ms7720se_defconfig   | 1 +
 include/config_cmd_all.h     | 1 -
 include/configs/dbau1x00.h   | 5 -----
 include/configs/ms7720se.h   | 1 -
 scripts/config_whitelist.txt | 1 -
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README b/README
index fe63a7090b..e05be8d9a7 100644
--- a/README
+++ b/README
@@ -813,7 +813,6 @@ The following options need to be configured:
 		CONFIG_CMD_NAND		* NAND support
 		CONFIG_CMD_NET		  bootp, tftpboot, rarpboot
 		CONFIG_CMD_NFS		  NFS support
-		CONFIG_CMD_PCMCIA		* PCMCIA support
 		CONFIG_CMD_PING		* send ICMP ECHO_REQUEST to network
 					  host
 		CONFIG_CMD_PORTIO	* Port I/O
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 007895c4ce..c9fb24d984 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -779,6 +779,14 @@ config CMD_PCI
           peripherals. Sub-commands allow bus enumeration, displaying and
           changing configuration space and a few other features.
 
+config CMD_PCMCIA
+	bool "pinit - Set up PCMCIA device"
+	help
+	  Provides a means to initialise a PCMCIA (Personal Computer Memory Card
+	  International Association) device. This is an old standard from about
+	  1990. These devices are typically removable memory or network cards using
+	  a standard 68-pin connector.
+
 endmenu
 
 
diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig
index 30e52692d0..e1d8588233 100644
--- a/configs/ms7720se_defconfig
+++ b/configs/ms7720se_defconfig
@@ -15,6 +15,7 @@ CONFIG_CMD_IDE=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FPGA is not set
+CONFIG_CMD_PCMCIA=y
 # CONFIG_CMD_ECHO is not set
 # CONFIG_CMD_ITEST is not set
 # CONFIG_CMD_SOURCE is not set
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index 2225cf7a6b..ea9860cf91 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -14,7 +14,6 @@
  */
 
 #define CONFIG_CMD_NAND		/* NAND support			*/
-#define CONFIG_CMD_PCMCIA	/* PCMCIA support		*/
 #define CONFIG_CMD_PORTIO	/* Port I/O			*/
 #define CONFIG_CMD_REGINFO	/* Register dump		*/
 #define CONFIG_CMD_REISER	/* Reiserfs support		*/
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 9db3380a95..782e0cbfda 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -67,11 +67,6 @@
  * Command line configuration.
  */
 
-#ifdef CONFIG_DBAU1550
-
-#undef CONFIG_CMD_PCMCIA
-#endif
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h
index 2855c00723..158b73ce50 100644
--- a/include/configs/ms7720se.h
+++ b/include/configs/ms7720se.h
@@ -13,7 +13,6 @@
 #define CONFIG_MS7720SE		1
 
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_PCMCIA
 
 #define CONFIG_BOOTARGS		"console=ttySC0,115200"
 #define CONFIG_BOOTFILE		"/boot/zImage"
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0eba95d4a1..6662b60754 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -296,7 +296,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_PCMCIA
 CONFIG_CMD_PORTIO
 CONFIG_CMD_READ
 CONFIG_CMD_REGINFO
-- 
2.14.0.rc0.284.gd933b75aa4-goog