Convert CONFIG_CMD_IMMAP to Kconfig

This converts the following to Kconfig:
   CONFIG_CMD_IMMAP

Also move this command out of the cmd/ directory since it is
PowerPC-specific.

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

diff --git a/README b/README
index 85d40e7630d4a458757790056aa511e5787ccbf5..b44c9aeed2e1bfe1c4c346d839d7ffa15fbda2a8 100644 (file)
--- a/README
+++ b/README
@@ -850,7 +850,6 @@ The following options need to be configured:
                CONFIG_CMD_IMI            iminfo
                CONFIG_CMD_IMLS           List all images found in NOR flash
                CONFIG_CMD_IMLS_NAND    * List all images found in NAND flash
-               CONFIG_CMD_IMMAP        * IMMR dump support
                CONFIG_CMD_IOTRACE      * I/O tracing for debugging
                CONFIG_CMD_IMPORTENV    * import an environment
                CONFIG_CMD_INI          * import data from an ini file into the env

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 3d2c1319c9605288377d89ca8c1419939fdb692d..eae94c8fd559b688b4b8bd577bbaf5c96c941082 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -49,6 +49,8 @@ config 4xx
 
 endchoice
 
+source "arch/powerpc/lib/Kconfig"
+
 source "arch/powerpc/cpu/mpc512x/Kconfig"
 source "arch/powerpc/cpu/mpc5xx/Kconfig"
 source "arch/powerpc/cpu/mpc5xxx/Kconfig"

diff --git a/arch/powerpc/lib/Kconfig b/arch/powerpc/lib/Kconfig
new file mode 100644 (file)
index 0000000..987cec9
--- /dev/null
+++ b/arch/powerpc/lib/Kconfig
@@ -0,0 +1,8 @@
+config CMD_IMMAP
+       bool "Enable various commands to dump IMMR information"
+       help
+         This enables various commands such as:
+
+           siuinfo - print System Interface Unit (SIU) registers
+           memcinfo - print Memory Controller registers
+           sitinfo - print System Integration Timers (SIT) registers

diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 88adb26e2e2d47b7ab806ec4f7b9a474a8b1f7a2..e09bd9a88a2b04f6a29cee2d2f6d5ccb64200035 100644 (file)
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -33,6 +33,7 @@ obj-$(CONFIG_BAT_RW) += bat_rw.o
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-y  += cache.o
 obj-y  += extable.o
+obj-$(CONFIG_CMD_IMMAP) += immap.o
 obj-y  += interrupts.o
 obj-$(CONFIG_CMD_KGDB) += kgdb.o
 obj-$(CONFIG_IDE) += ide.o

diff --git a/cmd/immap.c b/arch/powerpc/lib/immap.c
similarity index 100%
rename from cmd/immap.c
rename to arch/powerpc/lib/immap.c

diff --git a/cmd/Makefile b/cmd/Makefile
index f043407656935fd7a4e70a90c73c0745b1278b13..1293d24e394d5efaeb78f858ee6a345abca80cb6 100644 (file)
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -68,7 +68,6 @@ obj-$(CONFIG_CMD_I2C) += i2c.o
 obj-$(CONFIG_CMD_IOTRACE) += iotrace.o
 obj-$(CONFIG_CMD_HASH) += hash.o
 obj-$(CONFIG_CMD_IDE) += ide.o disk.o
-obj-$(CONFIG_CMD_IMMAP) += immap.o
 obj-$(CONFIG_CMD_INI) += ini.o
 obj-$(CONFIG_CMD_IRQ) += irq.o
 obj-$(CONFIG_CMD_ITEST) += itest.o

diff --git a/configs/canmb_defconfig b/configs/canmb_defconfig
index 1f6f18d601eb51a3ff20de197b275a1e85c31f41..87eb205d0c9cef319d56acdae3735d2bb2296473 100644 (file)
--- a/configs/canmb_defconfig
+++ b/configs/canmb_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_CANMB=y
 CONFIG_BOOTDELAY=5
 CONFIG_CMD_ASKENV=y

diff --git a/configs/kmcoge4_defconfig b/configs/kmcoge4_defconfig
index 5d274fa4ec368087f47fddea8ad7ed480c28c3a0..493d9712f9ea05f339e36279b558b8860ef8ca1d 100644 (file)
--- a/configs/kmcoge4_defconfig
+++ b/configs/kmcoge4_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_KMP204X=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/kmcoge5ne_defconfig b/configs/kmcoge5ne_defconfig
index 233943c0d7a53718f1e789c98ea73b84e4a40bb3..31cad022ef71895214ca750cfa7e02db0a40a9ae 100644 (file)
--- a/configs/kmcoge5ne_defconfig
+++ b/configs/kmcoge5ne_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_KM8360=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/kmeter1_defconfig b/configs/kmeter1_defconfig
index d92e6b2934f698516996e797483d2cce3d780b62..bb8a0fe2928930752100b8287e0e26faae62ecc4 100644 (file)
--- a/configs/kmeter1_defconfig
+++ b/configs/kmeter1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_KM8360=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/kmlion1_defconfig b/configs/kmlion1_defconfig
index 287ca8cbcbdc623704173f281f55c7ceca7d9150..56c5a8f289920053a64eee20fb61d67c84dcc097 100644 (file)
--- a/configs/kmlion1_defconfig
+++ b/configs/kmlion1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_KMP204X=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

diff --git a/configs/kmopti2_defconfig b/configs/kmopti2_defconfig
index 0b112ffb48fa3ce21070816a59d0f70d0df0df81..9e9c0b98432f3f023e3f28524d82fe6df5ae120b 100644 (file)
--- a/configs/kmopti2_defconfig
+++ b/configs/kmopti2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/kmsupx5_defconfig b/configs/kmsupx5_defconfig
index ba02124ccb4fb264baf5f727f4c5b1a114622595..52355307253be8d38322f96ec311342b936f9580 100644 (file)
--- a/configs/kmsupx5_defconfig
+++ b/configs/kmsupx5_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/kmtegr1_defconfig b/configs/kmtegr1_defconfig
index 16b7b18062271170fdf4d696d576564384e03ba1..464a125c39582992a26aa18492c14111b81cb6ba 100644 (file)
--- a/configs/kmtegr1_defconfig
+++ b/configs/kmtegr1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_SUVD3=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/kmtepr2_defconfig b/configs/kmtepr2_defconfig
index 3f7334620844dc2cea039b9ed745099052cbcd62..ca64a6e99e5a8476423da1fc2afdea9f08bbd118 100644 (file)
--- a/configs/kmtepr2_defconfig
+++ b/configs/kmtepr2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/kmvect1_defconfig b/configs/kmvect1_defconfig
index 8b9180b6a6db0f777db82dfea2bfd79883cc8f88..04a3e48d537d12592fc53617d933987ff2a25c3a 100644 (file)
--- a/configs/kmvect1_defconfig
+++ b/configs/kmvect1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_SUVD3=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/mgcoge3ne_defconfig b/configs/mgcoge3ne_defconfig
index d66fffe47eb03b4683e323075bdbf11818f22ad3..0d4a1e102d498cca4cbc10ee066e9df1f4f0c4a8 100644 (file)
--- a/configs/mgcoge3ne_defconfig
+++ b/configs/mgcoge3ne_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC8260=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_KM82XX=y
 CONFIG_FIT=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/mgcoge_defconfig b/configs/mgcoge_defconfig
index c9f07d11a49fcc666782e0602d592d3431ab835c..f4f8ae5452222120cad85950d4e43f4b0147636d 100644 (file)
--- a/configs/mgcoge_defconfig
+++ b/configs/mgcoge_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC8260=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_KM82XX=y
 CONFIG_FIT=y
 CONFIG_OF_BOARD_SETUP=y

diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig
index ab9ea810216d0cea8e6df9ccce3887c3596db88c..5521e6d01b84d67cbc77f16fd96f53389fd30970 100644 (file)
--- a/configs/motionpro_defconfig
+++ b/configs/motionpro_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_MOTIONPRO=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_VERSION_VARIABLE=y

diff --git a/configs/munices_defconfig b/configs/munices_defconfig
index ddd5c43de28a8d947d0704f23fac708f1fa668f8..0e2b188a51c07bcd5f8d2eea9167c27609962690 100644 (file)
--- a/configs/munices_defconfig
+++ b/configs/munices_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC5xxx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_MUNICES=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=5

diff --git a/configs/suvd3_defconfig b/configs/suvd3_defconfig
index 68fee8ce79b2fd7ed1fd7aadca5a3a05e1020219..68cfe65a5e5f95ef8321c417964a680a54f1081b 100644 (file)
--- a/configs/suvd3_defconfig
+++ b/configs/suvd3_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_SUVD3=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/tuge1_defconfig b/configs/tuge1_defconfig
index a5579e4f330a1d5dd395d3b5726dbe81efde0c0d..3cb1404c922a2c67484bf52fbb6b0e457fa9a63c 100644 (file)
--- a/configs/tuge1_defconfig
+++ b/configs/tuge1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/configs/tuxx1_defconfig b/configs/tuxx1_defconfig
index 519472f247377dd2d43d09663b6ec932c3360c8e..18b124a58c498563bf567a5f2d612ddd9b026995 100644 (file)
--- a/configs/tuxx1_defconfig
+++ b/configs/tuxx1_defconfig
@@ -1,5 +1,6 @@
 CONFIG_PPC=y
 CONFIG_MPC83xx=y
+CONFIG_CMD_IMMAP=y
 CONFIG_TARGET_TUXX1=y
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_STDOUT_VIA_ALIAS=y

diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index b00f96ef6eb31b229ac5565f8aa041d1679285da..8ab46ca47e8625ce9001e01767922fb0eb22dd4d 100644 (file)
--- 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_IMMAP       /* IMMR dump support            */
 #define CONFIG_CMD_IO          /* Access to X86 IO space       */
 #define CONFIG_CMD_IRQ         /* irqinfo                      */
 #define CONFIG_CMD_JFFS2       /* JFFS2 Support                */

diff --git a/include/configs/canmb.h b/include/configs/canmb.h
index c70979ed1af4c286979447c9653840da362da813..b7c74b42647aaccfe4d9130208a770f90eccb994 100644 (file)
--- a/include/configs/canmb.h
+++ b/include/configs/canmb.h
@@ -46,7 +46,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_REGINFO
 
 /*

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 506ce51236bbae10103c62ba36a692e4e6f16fab..08ccaa200c3dcac6e320128fcb486c712a49c050 100644 (file)
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -13,7 +13,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_MTDPARTS
 

diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 02ac7b30891b1a0e63e27b5dbcc126c3ba8d1e2b..035f1dc5f9694675ef38ce6e601dfb37aa792f76 100644 (file)
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -33,7 +33,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_JFFS2
 #define CONFIG_CMD_REGINFO
 

diff --git a/include/configs/munices.h b/include/configs/munices.h
index 1679430951755ecc79ce858691d8362cd8cc64b4..ad2d69e6a5315c2121159b97b4dbcffc1c54c2b3 100644 (file)
--- a/include/configs/munices.h
+++ b/include/configs/munices.h
@@ -26,7 +26,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_IMMAP
 #define CONFIG_CMD_REGINFO
 
 #if defined(CONFIG_CMD_KGDB)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 68c086a492077456253005a8af9dd89689b2eb92..5b78d2f7021180863618ddf2c5247683ffaba2d9 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -383,7 +383,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_IMMAP
 CONFIG_CMD_IMXOTP
 CONFIG_CMD_IMX_FUSE
 CONFIG_CMD_IO