diff --git a/README b/README
index 56fc47630aec8a98ee394468d945146bcdd16514..17c055a1ec47cadeb00b429fb8b6cc4552be0519 100644
--- a/README
+++ b/README
@@ -812,7 +812,6 @@ The following options need to be configured:
 		CONFIG_CMD_MII		* MII utility commands
 		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 8fab42d88416113f7bf46992163a2641b04958fe..ef614a6a5fd192e07791021010ef0f2b3aa60a97 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -741,6 +741,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.
+
 config CMD_REMOTEPROC
 	bool "remoteproc"
 	depends on REMOTEPROC
diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig
index 7f137fa911aaf96639cda69f75e43e177dfa567f..a9e3f452ec8257b963eace65651d1b2290dba15f 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 b1f699080e294359276fc4d9392a8518e320e092..a008bacdd9f62fb2fb6f7bff8b6c584a05d443c7 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_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 970e214e0746b17e204d2bff3144e4f8b56921cd..cd65ceaee93d8011abb87cfc0f4b5e1c593db328 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 86b93a39bb151dd9808b257a65f6f665ce07044f..112145ce77ec8ff43ed7bb1de1e7d1adb62ee47f 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 b2f50c0500614806fe8bff7dd5981aaed93bdd1c..358b17c31defd9b2a77e07ec17aa128d3d165f05 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -293,7 +293,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