From: Christophe Leroy
This patch converts CONFIG_CMD_REGINFO to Kconfig
Signed-off-by: Christophe Leroy
Signed-off-by: Simon Glass
---
Changes in v2:
- Fixed lots of merge conflicts with my series
- Pull in this patch from http://patchwork.ozlabs.org/patch/787724/ instead
README | 1 -
arch/powerpc/Kconfig | 3 +++
cmd/Kconfig | 5 +
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 -
48 files changed, 8 insertions(+), 196 deletions(-)
diff --git a/README b/README
index 2e813b7bcb..9b64ef06f4 100644
--- a/README
+++ b/README
@@ -814,7 +814,6 @@ The following options need to be configured:
CONFIG_CMD_NFSNFS support
CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network
host
- CONFIG_CMD_REGINFO * Register dump
CONFIG_CMD_RUNrun 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..c79b247651 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -23,15 +23,18 @@ config MPC85xx
imply USB_EHCI_HCD if USB
imply CMD_HASH
imply CMD_IRQ
+ imply CMD_REGINFO
config MPC86xx
bool "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/cmd/Kconfig b/cmd/Kconfig
index 15dcfbf1e9..070536ac23 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -158,6 +158,11 @@ config CMD_LICENSE
help
Print GPL license text
+config CMD_REGINFO
+ bool "reginfo"
+ help
+ Register dump
+
endmenu
menu "Boot commands"
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 984803d440..ce9be95e7e 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -690,11 +690,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 a7c97a3b79..38407af3c7 100644
---