kconfig: move CONFIG_CMD_BOOTM to Kconfig

CONFIG_CMD_BOOTM is defined in config_cmd_defaults.h
which is forcebly included from each board.
So, the default value of "config CMD_BOOTM" should be "y".

For some boards undefining it (bf506f-ezkit, controlcenterd_TRAILBLA,
controlcenterd_TRAILBLAZER_DEVELOP, controlcenterd_TRAILBLAZER),
"# CONFIG_CMD_BOOTM is not set" should be added to their defconfig.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/common/Kconfig b/common/Kconfig
index 5ae7190e932493125ef82fb23fdb2ed0bb1324f5..5dc8ebf04b4081db332e713cf37d92cc1d7cc75d 100644 (file)
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1,4 +1,10 @@
 menu "Command line interface"
        depends on !SPL_BUILD
 
+config CMD_BOOTM
+       bool "Enable bootm command"
+       default y
+       help
+         Boot an application image from the memory.
+
 endmenu

diff --git a/configs/bf506f-ezkit_defconfig b/configs/bf506f-ezkit_defconfig
index f81f412f565f39abf4a06723b73218748381cdb7..da25718709e68b45009d6d52ad67d4ccb5ab69fb 100644 (file)
--- a/configs/bf506f-ezkit_defconfig
+++ b/configs/bf506f-ezkit_defconfig
@@ -1,2 +1,3 @@
 CONFIG_BLACKFIN=y
 CONFIG_TARGET_BF506F_EZKIT=y
+# CONFIG_CMD_BOOTM is not set

diff --git a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
index be1a3711442f4aef9ac007483d5728f237766560..c8695abfecaa55cb697e57e708e08c35ad3f672a 100644 (file)
--- a/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
@@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH,DEVELOP"
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
+# CONFIG_CMD_BOOTM is not set

diff --git a/configs/controlcenterd_TRAILBLAZER_defconfig b/configs/controlcenterd_TRAILBLAZER_defconfig
index ab548a6fec1f38593c96fd41a2ce5eaee958b69f..730b96e55104b9ccaaad5705fdfe9ebfaee1bc9f 100644 (file)
--- a/configs/controlcenterd_TRAILBLAZER_defconfig
+++ b/configs/controlcenterd_TRAILBLAZER_defconfig
@@ -2,3 +2,4 @@ CONFIG_SYS_EXTRA_OPTIONS="TRAILBLAZER,SPIFLASH"
 CONFIG_PPC=y
 CONFIG_MPC85xx=y
 CONFIG_TARGET_CONTROLCENTERD=y
+# CONFIG_CMD_BOOTM is not set

diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index a55b268b9b37c71fd730416d426602777912d0d1..8e3d5b4c82a887f2dcebd524b8b3d289c5710657 100644 (file)
--- a/include/config_cmd_defaults.h
+++ b/include/config_cmd_defaults.h
@@ -9,7 +9,6 @@
 #ifndef _CONFIG_CMD_DEFAULTS_H_
 #define _CONFIG_CMD_DEFAULTS_H_
 
-#define CONFIG_CMD_BOOTM 1
 #define CONFIG_CMD_CRC32 1
 #define CONFIG_CMD_EXPORTENV 1
 #define CONFIG_CMD_GO 1

diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h
index 5db181984f30957bae05fd5d9106db939d6c5a53..fdd10c3a9805727e2fcb1348e3486f4597e3b793 100644 (file)
--- a/include/configs/bf506f-ezkit.h
+++ b/include/configs/bf506f-ezkit.h
@@ -102,7 +102,6 @@
 #define CONFIG_CMD_MEMORY
 #undef CONFIG_GZIP
 #undef CONFIG_ZLIB
-#undef CONFIG_CMD_BOOTM
 #undef CONFIG_BOOTM_RTEMS
 #undef CONFIG_BOOTM_LINUX
 

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 7eaaf69951b2ce153960bd4abac0f7a9e890074c..bfcfa0c8c97ecc5dc5ca980d86ed344025796ba7 100644 (file)
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -434,7 +434,6 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_LAST_STAGE_INIT
-#undef CONFIG_CMD_BOOTM
 
 #endif /* CONFIG_TRAILBLAZER */