summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README1
-rw-r--r--cmd/Kconfig8
-rw-r--r--configs/ms7720se_defconfig1
-rw-r--r--include/config_cmd_all.h1
-rw-r--r--include/configs/dbau1x00.h5
-rw-r--r--include/configs/ms7720se.h1
-rw-r--r--scripts/config_whitelist.txt1
7 files changed, 9 insertions, 9 deletions
diff --git a/README b/README
index 56fc47630a..17c055a1ec 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 8fab42d884..ef614a6a5f 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 7f137fa911..a9e3f452ec 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 b1f699080e..a008bacdd9 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 970e214e07..cd65ceaee9 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 86b93a39bb..112145ce77 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 b2f50c0500..358b17c31d 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