From fa379223cd61052331342e525778d96270ee6ed9 Mon Sep 17 00:00:00 2001
From: Christophe Leroy <christophe.leroy@c-s.fr>
Date: Fri, 4 Aug 2017 16:34:40 -0600
Subject: [PATCH] Convert CONFIG_CMD_REGINFO to Kconfig

This patch converts CONFIG_CMD_REGINFO to Kconfig

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---
 README                                        |  1 -
 arch/powerpc/Kconfig                          |  2 ++
 arch/powerpc/cpu/mpc85xx/Kconfig              | 26 +++++++++++++++++++
 cmd/Kconfig                                   |  6 +++++
 configs/MPC8541CDS_defconfig                  |  1 +
 configs/MPC8541CDS_legacy_defconfig           |  1 +
 configs/MPC8544DS_defconfig                   |  1 +
 configs/MPC8555CDS_defconfig                  |  1 +
 configs/MPC8555CDS_legacy_defconfig           |  1 +
 configs/MPC8568MDS_defconfig                  |  1 +
 configs/MPC8569MDS_ATM_defconfig              |  1 +
 configs/MPC8569MDS_defconfig                  |  1 +
 configs/MPC8572DS_36BIT_defconfig             |  1 +
 configs/MPC8572DS_defconfig                   |  1 +
 configs/P1022DS_36BIT_NAND_defconfig          |  1 +
 configs/P1022DS_36BIT_SDCARD_defconfig        |  1 +
 configs/P1022DS_36BIT_SPIFLASH_defconfig      |  1 +
 configs/P1022DS_36BIT_defconfig               |  1 +
 configs/P1022DS_NAND_defconfig                |  1 +
 configs/P1022DS_SDCARD_defconfig              |  1 +
 configs/P1022DS_SPIFLASH_defconfig            |  1 +
 configs/P1022DS_defconfig                     |  1 +
 configs/P1023RDB_defconfig                    |  1 +
 ...trolcenterd_36BIT_SDCARD_DEVELOP_defconfig |  1 +
 configs/controlcenterd_36BIT_SDCARD_defconfig |  1 +
 configs/qemu-ppce500_defconfig                |  1 +
 configs/socrates_defconfig                    |  1 +
 configs/xpedite537x_defconfig                 |  1 +
 include/config_cmd_all.h                      |  1 -
 include/configs/B4860QDS.h                    |  5 ----
 include/configs/BSC9131RDB.h                  |  5 ----
 include/configs/BSC9132QDS.h                  |  5 ----
 include/configs/C29XPCIE.h                    |  5 ----
 include/configs/MCR3000.h                     |  3 ---
 include/configs/MPC8536DS.h                   |  5 ----
 include/configs/MPC8541CDS.h                  |  5 ----
 include/configs/MPC8544DS.h                   |  5 ----
 include/configs/MPC8548CDS.h                  |  5 ----
 include/configs/MPC8555CDS.h                  |  5 ----
 include/configs/MPC8560ADS.h                  |  8 ------
 include/configs/MPC8568MDS.h                  |  5 ----
 include/configs/MPC8569MDS.h                  |  5 ----
 include/configs/MPC8572DS.h                   |  5 ----
 include/configs/MPC8610HPCD.h                 |  2 --
 include/configs/MPC8641HPCN.h                 |  5 ----
 include/configs/P1010RDB.h                    |  5 ----
 include/configs/P1022DS.h                     |  5 ----
 include/configs/P1023RDB.h                    |  5 ----
 include/configs/T102xQDS.h                    |  5 ----
 include/configs/T102xRDB.h                    |  5 ----
 include/configs/T1040QDS.h                    |  5 ----
 include/configs/T104xRDB.h                    |  5 ----
 include/configs/T208xQDS.h                    |  5 ----
 include/configs/T208xRDB.h                    |  5 ----
 include/configs/T4240RDB.h                    |  2 --
 include/configs/TQM834x.h                     |  5 ----
 include/configs/UCP1020.h                     |  5 ----
 include/configs/controlcenterd.h              |  3 ---
 include/configs/corenet_ds.h                  |  5 ----
 include/configs/cyrus.h                       |  5 ----
 include/configs/p1_p2_rdb_pc.h                |  5 ----
 include/configs/p1_twr.h                      |  5 ----
 include/configs/qemu-ppce500.h                |  2 --
 include/configs/sbc8548.h                     |  5 ----
 include/configs/sbc8641d.h                    |  2 --
 include/configs/smdkc100.h                    |  3 ---
 include/configs/socrates.h                    |  1 -
 include/configs/t4qds.h                       |  2 --
 include/configs/xpedite517x.h                 |  5 ----
 include/configs/xpedite520x.h                 |  5 ----
 include/configs/xpedite537x.h                 |  5 ----
 include/configs/xpedite550x.h                 |  5 ----
 scripts/config_whitelist.txt                  |  1 -
 73 files changed, 58 insertions(+), 196 deletions(-)

diff --git a/README b/README
index fb5f47166d..0b5dafc1f2 100644
--- a/README
+++ b/README
@@ -814,7 +814,6 @@ The following options need to be configured:
 		CONFIG_CMD_NFS		  NFS support
 		CONFIG_CMD_PING		* send ICMP ECHO_REQUEST to network
 					  host
-		CONFIG_CMD_REGINFO	* Register dump
 		CONFIG_CMD_RUN		  run command in env variable
 		CONFIG_CMD_SANDBOX	* sb command to access sandbox features
 		CONFIG_CMD_SAVES	* save S record dump
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8094416e4a..7ac5cbfca6 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -29,9 +29,11 @@ config MPC86xx
 	select SYS_FSL_DDR
 	select SYS_FSL_DDR_BE
 	imply ENV_IS_IN_FLASH
+	imply CMD_REGINFO
 
 config 8xx
 	bool "MPC8xx"
+	imply CMD_REGINFO
 
 endchoice
 
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 22fd306bfc..ccdf103624 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -427,6 +427,7 @@ config ARCH_B4420
 	select FSL_IFC
 	imply CMD_EEPROM
 	imply CMD_NAND
+	imply CMD_REGINFO
 
 config ARCH_B4860
 	bool
@@ -454,6 +455,7 @@ config ARCH_B4860
 	select FSL_IFC
 	imply CMD_EEPROM
 	imply CMD_NAND
+	imply CMD_REGINFO
 
 config ARCH_BSC9131
 	bool
@@ -469,6 +471,7 @@ config ARCH_BSC9131
 	select FSL_IFC
 	imply CMD_EEPROM
 	imply CMD_NAND
+	imply CMD_REGINFO
 
 config ARCH_BSC9132
 	bool
@@ -490,6 +493,7 @@ config ARCH_BSC9132
 	imply CMD_MTDPARTS
 	imply CMD_NAND
 	imply CMD_PCI
+	imply CMD_REGINFO
 
 config ARCH_C29X
 	bool
@@ -505,6 +509,7 @@ config ARCH_C29X
 	select FSL_IFC
 	imply CMD_NAND
 	imply CMD_PCI
+	imply CMD_REGINFO
 
 config ARCH_MPC8536
 	bool
@@ -520,6 +525,7 @@ config ARCH_MPC8536
 	select FSL_ELBC
 	imply CMD_NAND
 	imply CMD_SATA
+	imply CMD_REGINFO
 
 config ARCH_MPC8540
 	bool
@@ -560,6 +566,7 @@ config ARCH_MPC8548
 	select SYS_FSL_SEC_COMPAT_2
 	select SYS_PPC_E500_USE_DEBUG_TLB
 	imply ENV_IS_IN_FLASH
+	imply CMD_REGINFO
 
 config ARCH_MPC8555
 	bool
@@ -636,6 +643,7 @@ config ARCH_P1010
 	imply CMD_NAND
 	imply CMD_SATA
 	imply CMD_PCI
+	imply CMD_REGINFO
 
 config ARCH_P1011
 	bool
@@ -667,6 +675,7 @@ config ARCH_P1020
 	imply CMD_NAND
 	imply CMD_SATA
 	imply CMD_PCI
+	imply CMD_REGINFO
 
 config ARCH_P1021
 	bool
@@ -681,8 +690,10 @@ config ARCH_P1021
 	select SYS_FSL_SEC_COMPAT_2
 	select SYS_PPC_E500_USE_DEBUG_TLB
 	select FSL_ELBC
+	imply CMD_REGINFO
 	imply CMD_NAND
 	imply CMD_SATA
+	imply CMD_REGINFO
 
 config ARCH_P1022
 	bool
@@ -729,6 +740,7 @@ config ARCH_P1024
 	imply CMD_NAND
 	imply CMD_SATA
 	imply CMD_PCI
+	imply CMD_REGINFO
 
 config ARCH_P1025
 	bool
@@ -744,6 +756,7 @@ config ARCH_P1025
 	select SYS_PPC_E500_USE_DEBUG_TLB
 	select FSL_ELBC
 	imply CMD_SATA
+	imply CMD_REGINFO
 
 config ARCH_P2020
 	bool
@@ -761,6 +774,7 @@ config ARCH_P2020
 	select FSL_ELBC
 	imply CMD_EEPROM
 	imply CMD_NAND
+	imply CMD_REGINFO
 
 config ARCH_P2041
 	bool
@@ -810,6 +824,7 @@ config ARCH_P3041
 	select FSL_ELBC
 	imply CMD_NAND
 	imply CMD_SATA
+	imply CMD_REGINFO
 
 config ARCH_P4080
 	bool
@@ -846,6 +861,7 @@ config ARCH_P4080
 	select SYS_FSL_SEC_COMPAT_4
 	select FSL_ELBC
 	imply CMD_SATA
+	imply CMD_REGINFO
 
 config ARCH_P5020
 	bool
@@ -868,6 +884,7 @@ config ARCH_P5020
 	select SYS_PPC64
 	select FSL_ELBC
 	imply CMD_SATA
+	imply CMD_REGINFO
 
 config ARCH_P5040
 	bool
@@ -890,6 +907,7 @@ config ARCH_P5040
 	select SYS_PPC64
 	select FSL_ELBC
 	imply CMD_SATA
+	imply CMD_REGINFO
 
 config ARCH_QEMU_E500
 	bool
@@ -912,6 +930,7 @@ config ARCH_T1023
 	select FSL_IFC
 	imply CMD_EEPROM
 	imply CMD_NAND
+	imply CMD_REGINFO
 
 config ARCH_T1024
 	bool
@@ -932,6 +951,7 @@ config ARCH_T1024
 	imply CMD_EEPROM
 	imply CMD_NAND
 	imply CMD_MTDPARTS
+	imply CMD_REGINFO
 
 config ARCH_T1040
 	bool
@@ -953,6 +973,7 @@ config ARCH_T1040
 	imply CMD_MTDPARTS
 	imply CMD_NAND
 	imply CMD_SATA
+	imply CMD_REGINFO
 
 config ARCH_T1042
 	bool
@@ -974,6 +995,7 @@ config ARCH_T1042
 	imply CMD_MTDPARTS
 	imply CMD_NAND
 	imply CMD_SATA
+	imply CMD_REGINFO
 
 config ARCH_T2080
 	bool
@@ -998,6 +1020,7 @@ config ARCH_T2080
 	select FSL_IFC
 	imply CMD_SATA
 	imply CMD_NAND
+	imply CMD_REGINFO
 
 config ARCH_T2081
 	bool
@@ -1019,6 +1042,7 @@ config ARCH_T2081
 	select SYS_PPC64
 	select FSL_IFC
 	imply CMD_NAND
+	imply CMD_REGINFO
 
 config ARCH_T4160
 	bool
@@ -1042,6 +1066,7 @@ config ARCH_T4160
 	select FSL_IFC
 	imply CMD_SATA
 	imply CMD_NAND
+	imply CMD_REGINFO
 
 config ARCH_T4240
 	bool
@@ -1068,6 +1093,7 @@ config ARCH_T4240
 	select FSL_IFC
 	imply CMD_SATA
 	imply CMD_NAND
+	imply CMD_REGINFO
 
 config BOOKE
 	bool
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 0d9292b4f6..2caa0b42d8 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -158,6 +158,12 @@ config CMD_LICENSE
 	help
 	  Print GPL license text
 
+config CMD_REGINFO
+	bool "reginfo"
+	depends on PPC
+	help
+	  Register dump
+
 endmenu
 
 menu "Boot commands"
diff --git a/configs/MPC8541CDS_defconfig b/configs/MPC8541CDS_defconfig
index e5f37ec38b..2d8845aa1e 100644
--- a/configs/MPC8541CDS_defconfig
+++ b/configs/MPC8541CDS_defconfig
@@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_MII=y
diff --git a/configs/MPC8541CDS_legacy_defconfig b/configs/MPC8541CDS_legacy_defconfig
index 77eaa899cf..d7650c18bb 100644
--- a/configs/MPC8541CDS_legacy_defconfig
+++ b/configs/MPC8541CDS_legacy_defconfig
@@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_MII=y
diff --git a/configs/MPC8544DS_defconfig b/configs/MPC8544DS_defconfig
index fb7057a722..c4147f244b 100644
--- a/configs/MPC8544DS_defconfig
+++ b/configs/MPC8544DS_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=10
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_PCI=y
diff --git a/configs/MPC8555CDS_defconfig b/configs/MPC8555CDS_defconfig
index 8c46336df8..54ab7e1923 100644
--- a/configs/MPC8555CDS_defconfig
+++ b/configs/MPC8555CDS_defconfig
@@ -7,6 +7,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_MII=y
diff --git a/configs/MPC8555CDS_legacy_defconfig b/configs/MPC8555CDS_legacy_defconfig
index 3425bc532d..f6a4877d23 100644
--- a/configs/MPC8555CDS_legacy_defconfig
+++ b/configs/MPC8555CDS_legacy_defconfig
@@ -8,6 +8,7 @@ CONFIG_SYS_EXTRA_OPTIONS="LEGACY"
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=10
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_MII=y
diff --git a/configs/MPC8568MDS_defconfig b/configs/MPC8568MDS_defconfig
index 48fd6ac9e5..99e6cbd2d2 100644
--- a/configs/MPC8568MDS_defconfig
+++ b/configs/MPC8568MDS_defconfig
@@ -8,6 +8,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=10
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_DHCP=y
diff --git a/configs/MPC8569MDS_ATM_defconfig b/configs/MPC8569MDS_ATM_defconfig
index d81c2df9b6..fb26bf3916 100644
--- a/configs/MPC8569MDS_ATM_defconfig
+++ b/configs/MPC8569MDS_ATM_defconfig
@@ -10,6 +10,7 @@ CONFIG_BOOTDELAY=10
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_DHCP=y
diff --git a/configs/MPC8569MDS_defconfig b/configs/MPC8569MDS_defconfig
index 0c1f8f527e..27de5d613a 100644
--- a/configs/MPC8569MDS_defconfig
+++ b/configs/MPC8569MDS_defconfig
@@ -9,6 +9,7 @@ CONFIG_BOOTDELAY=10
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_DHCP=y
diff --git a/configs/MPC8572DS_36BIT_defconfig b/configs/MPC8572DS_36BIT_defconfig
index ad6c307fb2..44ad3aabfa 100644
--- a/configs/MPC8572DS_36BIT_defconfig
+++ b/configs/MPC8572DS_36BIT_defconfig
@@ -10,6 +10,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=10
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_PCI=y
diff --git a/configs/MPC8572DS_defconfig b/configs/MPC8572DS_defconfig
index 111c4f103e..ac985d98d9 100644
--- a/configs/MPC8572DS_defconfig
+++ b/configs/MPC8572DS_defconfig
@@ -9,6 +9,7 @@ CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=10
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_PCI=y
diff --git a/configs/P1022DS_36BIT_NAND_defconfig b/configs/P1022DS_36BIT_NAND_defconfig
index d81e9283f8..efb90b97a7 100644
--- a/configs/P1022DS_36BIT_NAND_defconfig
+++ b/configs/P1022DS_36BIT_NAND_defconfig
@@ -21,6 +21,7 @@ CONFIG_TPL_ENV_SUPPORT=y
 CONFIG_TPL_I2C_SUPPORT=y
 CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
diff --git a/configs/P1022DS_36BIT_SDCARD_defconfig b/configs/P1022DS_36BIT_SDCARD_defconfig
index 1e610315bf..3383f5bd44 100644
--- a/configs/P1022DS_36BIT_SDCARD_defconfig
+++ b/configs/P1022DS_36BIT_SDCARD_defconfig
@@ -19,6 +19,7 @@ CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
diff --git a/configs/P1022DS_36BIT_SPIFLASH_defconfig b/configs/P1022DS_36BIT_SPIFLASH_defconfig
index be6306df00..72a7fac627 100644
--- a/configs/P1022DS_36BIT_SPIFLASH_defconfig
+++ b/configs/P1022DS_36BIT_SPIFLASH_defconfig
@@ -20,6 +20,7 @@ CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
diff --git a/configs/P1022DS_36BIT_defconfig b/configs/P1022DS_36BIT_defconfig
index 830597fd57..a8314843e4 100644
--- a/configs/P1022DS_36BIT_defconfig
+++ b/configs/P1022DS_36BIT_defconfig
@@ -10,6 +10,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=10
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
diff --git a/configs/P1022DS_NAND_defconfig b/configs/P1022DS_NAND_defconfig
index 8d9e3666d7..b6deec9dea 100644
--- a/configs/P1022DS_NAND_defconfig
+++ b/configs/P1022DS_NAND_defconfig
@@ -21,6 +21,7 @@ CONFIG_TPL_I2C_SUPPORT=y
 CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_TPL_NAND_SUPPORT=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
diff --git a/configs/P1022DS_SDCARD_defconfig b/configs/P1022DS_SDCARD_defconfig
index 0f79a2a73b..0c80566a04 100644
--- a/configs/P1022DS_SDCARD_defconfig
+++ b/configs/P1022DS_SDCARD_defconfig
@@ -18,6 +18,7 @@ CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
diff --git a/configs/P1022DS_SPIFLASH_defconfig b/configs/P1022DS_SPIFLASH_defconfig
index f9f02f53c6..7f447fcd7b 100644
--- a/configs/P1022DS_SPIFLASH_defconfig
+++ b/configs/P1022DS_SPIFLASH_defconfig
@@ -19,6 +19,7 @@ CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
diff --git a/configs/P1022DS_defconfig b/configs/P1022DS_defconfig
index 82a9387c8b..2ccbffdf77 100644
--- a/configs/P1022DS_defconfig
+++ b/configs/P1022DS_defconfig
@@ -9,6 +9,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=10
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
diff --git a/configs/P1023RDB_defconfig b/configs/P1023RDB_defconfig
index 095a2e2b1e..23d5473cce 100644
--- a/configs/P1023RDB_defconfig
+++ b/configs/P1023RDB_defconfig
@@ -10,6 +10,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=-1
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 # CONFIG_CMD_EEPROM is not set
 CONFIG_CMD_NAND=y
 CONFIG_CMD_I2C=y
diff --git a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
index 89ca5dbe67..6f84eb808e 100644
--- a/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_DEVELOP_defconfig
@@ -16,6 +16,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_EEPROM=y
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/controlcenterd_36BIT_SDCARD_defconfig b/configs/controlcenterd_36BIT_SDCARD_defconfig
index 7396ef94d4..e48729881e 100644
--- a/configs/controlcenterd_36BIT_SDCARD_defconfig
+++ b/configs/controlcenterd_36BIT_SDCARD_defconfig
@@ -16,6 +16,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_EEPROM=y
 # CONFIG_CMD_FLASH is not set
diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig
index e7884d300b..c48b22efe2 100644
--- a/configs/qemu-ppce500_defconfig
+++ b/configs/qemu-ppce500_defconfig
@@ -11,6 +11,7 @@ CONFIG_BOOTDELAY=1
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set
 CONFIG_CMD_GREPENV=y
diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index f5356cb120..0d8753636e 100644
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -12,6 +12,7 @@ CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_NAND=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_PCI=y
diff --git a/configs/xpedite537x_defconfig b/configs/xpedite537x_defconfig
index 7765ab46d3..657fdcc7fd 100644
--- a/configs/xpedite537x_defconfig
+++ b/configs/xpedite537x_defconfig
@@ -8,6 +8,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y
 CONFIG_BOOTDELAY=3
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_REGINFO=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_EEPROM=y
 CONFIG_CMD_I2C=y
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index edfc91ff9b..cb0ab6d61a 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_REGINFO	/* Register dump		*/
 #define CONFIG_CMD_REISER	/* Reiserfs support		*/
 #define CONFIG_CMD_SANDBOX	/* sb command to access sandbox features */
 #define CONFIG_CMD_SAVES	/* save S record dump		*/
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index fe04a1f72a..f2313a5cca 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -689,11 +689,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
 * USB
 */
diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 57d4bed89a..19c772c968 100644
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -284,11 +284,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE		/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h
index 35ebdd28b3..92ff88bebc 100644
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -507,11 +507,6 @@ combinations. this should be removed later
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h
index 466bab4823..8c664b184d 100644
--- a/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@ -425,11 +425,6 @@
 #define CONFIG_LOADS_ECHO
 #define CONFIG_SYS_LOADS_BAUD_CHANGE
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/MCR3000.h b/include/configs/MCR3000.h
index 17090da796..aabbab6e05 100644
--- a/include/configs/MCR3000.h
+++ b/include/configs/MCR3000.h
@@ -151,7 +151,4 @@
 #define	BOOTFLAG_COLD			0x01
 #define BOOTFLAG_WARM			0x02
 
-/* Misc Settings */
-#define CONFIG_CMD_REGINFO
-
 #endif /* __CONFIG_H */
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index e3a89164b1..3a054734f4 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -578,11 +578,6 @@
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 #ifdef CONFIG_MMC
diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h
index 3867b31e23..aa450fcaa4 100644
--- a/include/configs/MPC8541CDS.h
+++ b/include/configs/MPC8541CDS.h
@@ -338,11 +338,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h
index 16b7b990c1..13d4cb4813 100644
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -342,11 +342,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * USB
  */
diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 3e63c7442d..0857f0c924 100644
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -456,11 +456,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index 3dc24bd74e..b580c33070 100644
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -336,11 +336,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index 8b8be2da0e..672ae5007c 100644
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -349,14 +349,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
-#if defined(CONFIG_ETHER_ON_FCC)
-#endif
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index e6b1ea982f..29f3d09cfd 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -351,11 +351,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 6f2fa4939a..a0d48af908 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -443,11 +443,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 #ifdef CONFIG_MMC
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 60e4154a4e..0960ff5b49 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -540,11 +540,6 @@
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * USB
  */
diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h
index 807624e2ce..e13fff0375 100644
--- a/include/configs/MPC8610HPCD.h
+++ b/include/configs/MPC8610HPCD.h
@@ -262,8 +262,6 @@
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
 
-#define CONFIG_CMD_REGINFO
-
 #define CONFIG_ULI526X
 #ifdef CONFIG_ULI526X
 #endif
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index b74ef38513..607e8bd114 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -582,11 +582,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index 82fc6b9070..384027c21d 100644
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -709,11 +709,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 #if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI_HCD) \
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 0c4e288ffb..8c83f2d34b 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -580,11 +580,6 @@
 #define CONFIG_LOADS_ECHO
 #define CONFIG_SYS_LOADS_BAUD_CHANGE
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * USB
  */
diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index f79e43ad46..1e41035354 100644
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -236,11 +236,6 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * USB
  */
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 4439b65f84..d58af7b843 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -767,11 +767,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 2dd7050f65..c94b837ce4 100644
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -778,11 +778,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index f59143e3dc..98cee8a600 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -646,11 +646,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index b56e475c14..a54e17c349 100644
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -761,11 +761,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index dcc78280ea..c1c3fa13d8 100644
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -732,11 +732,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_LOADS_ECHO	/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index a7a7873f51..803d8fbe5f 100644
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -678,11 +678,6 @@ unsigned long get_board_ddr_clk(void);
  * Environment
  */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 88da31c883..fee8b8fe45 100644
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -56,8 +56,6 @@
 
 #define CONFIG_DDR_ECC
 
-#define CONFIG_CMD_REGINFO
-
 /* High Level Configuration Options */
 #define CONFIG_SYS_BOOK3E_HV		/* Category E.HV supported */
 #define CONFIG_MP			/* support multiple processors */
diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h
index aab8b5d9f2..b9923c316b 100644
--- a/include/configs/TQM834x.h
+++ b/include/configs/TQM834x.h
@@ -213,11 +213,6 @@
 
 #endif	/* CONFIG_TSEC_ENET */
 
-/*
- * General PCI
- * Addresses are mapped 1-1.
- */
-
 #if defined(CONFIG_PCI)
 
 #define CONFIG_PCI_SCAN_SHOW		/* show pci devices on startup */
diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h
index 350870a074..43300f5967 100644
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -410,11 +410,6 @@
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * USB
  */
diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 6a26f066e8..52be713af4 100644
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -333,9 +333,6 @@
 #define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE
 
 #ifndef CONFIG_TRAILBLAZER
-
-#define CONFIG_CMD_REGINFO
-
 /*
  * Board initialisation callbacks
  */
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 39318078de..1d4524e05a 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -579,11 +579,6 @@
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
 * USB
 */
diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h
index 02a73f4578..52895865ba 100644
--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -403,11 +403,6 @@
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * USB
  */
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index 68016bc02b..3b3baefaf0 100644
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -796,11 +796,6 @@
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * USB
  */
diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h
index 377f79a251..a60a82d8a2 100644
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -372,11 +372,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_LOADS_ECHO		/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	/* allow baudrate change */
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * USB
  */
diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 2c9a3466f7..e0cc873e06 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -10,8 +10,6 @@
 #ifndef __QEMU_PPCE500_H
 #define __QEMU_PPCE500_H
 
-#define CONFIG_CMD_REGINFO
-
 #undef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0xf01000 /* 15 MB */
 
diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h
index 0dc47a125d..fd1bf991ba 100644
--- a/include/configs/sbc8548.h
+++ b/include/configs/sbc8548.h
@@ -506,11 +506,6 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
-/*
- * Command line configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index de123fdd9c..dcce2ba193 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -450,8 +450,6 @@
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE	1	/* allow baudrate change */
 
-#define CONFIG_CMD_REGINFO
-
 #undef CONFIG_WATCHDOG			/* watchdog disabled */
 
 /*
diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
index 58abac5eef..f5d541d20b 100644
--- a/include/configs/smdkc100.h
+++ b/include/configs/smdkc100.h
@@ -56,9 +56,6 @@
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 
-/***********************************************************
- * Command definition
- ***********************************************************/
 #define CONFIG_MTD_DEVICE
 #define CONFIG_MTD_PARTITIONS
 
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index ccc722de31..c1f7005c2f 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -277,7 +277,6 @@
  * Command line configuration.
  */
 #define CONFIG_CMD_SDRAM
-#define CONFIG_CMD_REGINFO
 
 #undef CONFIG_WATCHDOG			/* watchdog disabled		*/
 
diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h
index 6098dd9555..bd98cc650e 100644
--- a/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@ -10,8 +10,6 @@
 #ifndef __T4QDS_H
 #define __T4QDS_H
 
-#define CONFIG_CMD_REGINFO
-
 /* High Level Configuration Options */
 #define CONFIG_SYS_BOOK3E_HV		/* Category E.HV supported */
 #define CONFIG_MP			/* support multiple processors */
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index e38a8b70fa..c4cd74999c 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -480,11 +480,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 				 BATL_CACHEINHIBIT)
 #define CONFIG_SYS_IBAT7U	CONFIG_SYS_DBAT7U
 
-/*
- * Command configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h
index a23c326884..8fb0541604 100644
--- a/include/configs/xpedite520x.h
+++ b/include/configs/xpedite520x.h
@@ -283,11 +283,6 @@
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_GATEWAY
 
-/*
- * Command configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index dd0aa07904..85faaf0ca3 100644
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -333,11 +333,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define TSEC2_PHYIDX		0
 #define CONFIG_HAS_ETH1
 
-/*
- * Command configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h
index 16fa8007a1..033537ca4a 100644
--- a/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@ -332,11 +332,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
-/*
- * Command configuration.
- */
-#define CONFIG_CMD_REGINFO
-
 /*
  * Miscellaneous configurable options
  */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5ad5a3b1a4..888af42524 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_REGINFO
 CONFIG_CMD_REISER
 CONFIG_CMD_SANDBOX
 CONFIG_CMD_SAVES
-- 
2.39.5