diff options
| author | Simon Glass | 2017-05-17 03:25:31 -0600 |
|---|---|---|
| committer | Tom Rini | 2017-05-22 12:45:28 -0400 |
| commit | c7c111e5f73278f838c4e9284503078dd7b46139 (patch) | |
| tree | abfed2bc5360b39435427ece5aa9cd15105def73 | |
| parent | fc843a02acad62e231a3e779cebd1712688146fc (diff) | |
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>
29 files changed, 28 insertions, 8 deletions
@@ -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 3d2c1319c96..eae94c8fd55 100644 --- 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 index 00000000000..987cec99cb8 --- /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 88adb26e2e2..e09bd9a88a2 100644 --- 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 index 1414f9ad55d..1414f9ad55d 100644 --- a/cmd/immap.c +++ b/arch/powerpc/lib/immap.c diff --git a/cmd/Makefile b/cmd/Makefile index f0434076569..1293d24e394 100644 --- 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 1f6f18d601e..87eb205d0c9 100644 --- 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 5d274fa4ec3..493d9712f9e 100644 --- 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 233943c0d7a..31cad022ef7 100644 --- 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 d92e6b2934f..bb8a0fe2928 100644 --- 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 287ca8cbcbd..56c5a8f2899 100644 --- 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 0b112ffb48f..9e9c0b98432 100644 --- 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 ba02124ccb4..52355307253 100644 --- 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 16b7b180622..464a125c395 100644 --- 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 3f733462084..ca64a6e99e5 100644 --- 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 8b9180b6a6d..04a3e48d537 100644 --- 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 d66fffe47eb..0d4a1e102d4 100644 --- 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 c9f07d11a49..f4f8ae54522 100644 --- 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 ab9ea810216..5521e6d01b8 100644 --- 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 ddd5c43de28..0e2b188a51c 100644 --- 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 68fee8ce79b..68cfe65a5e5 100644 --- 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 a5579e4f330..3cb1404c922 100644 --- 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 519472f2473..18b124a58c4 100644 --- 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 b00f96ef6eb..8ab46ca47e8 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_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 c70979ed1af..b7c74b42647 100644 --- 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 506ce51236b..08ccaa200c3 100644 --- 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 02ac7b30891..035f1dc5f96 100644 --- 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 16794309517..ad2d69e6a53 100644 --- 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 68c086a4920..5b78d2f7021 100644 --- 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 |