[U-Boot] [PATCH v2 03/10] kconfig: move CONFIG_CMD_BOOTM to Kconfig

[Masahiro Yamada]

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 at jp.panasonic.com>
---

Changes in v2:
  - fix a type; boom => bootm
  - add a help message

 common/Kconfig                                       | 6 ++++++
 configs/bf506f-ezkit_defconfig                       | 1 +
 configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig | 1 +
 configs/controlcenterd_TRAILBLAZER_defconfig         | 1 +
 include/config_cmd_defaults.h                        | 1 -
 include/configs/bf506f-ezkit.h                       | 1 -
 include/configs/controlcenterd.h                     | 1 -
 7 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/common/Kconfig b/common/Kconfig
index 5ae7190..5dc8ebf 100644
--- 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 f81f412..da25718 100644
--- 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 be1a371..c8695ab 100644
--- 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 ab548a6..730b96e 100644
--- 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 a55b268..8e3d5b4 100644
--- 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 5db1819..fdd10c3 100644
--- 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 7eaaf69..bfcfa0c 100644
--- 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 */
 
-- 
1.9.1