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>
master
Masahiro Yamada 11 years ago committed by Tom Rini
parent b0928da648
commit dba1697057
  1. 6
      common/Kconfig
  2. 1
      configs/bf506f-ezkit_defconfig
  3. 1
      configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
  4. 1
      configs/controlcenterd_TRAILBLAZER_defconfig
  5. 1
      include/config_cmd_defaults.h
  6. 1
      include/configs/bf506f-ezkit.h
  7. 1
      include/configs/controlcenterd.h

@ -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

@ -1,2 +1,3 @@
CONFIG_BLACKFIN=y
CONFIG_TARGET_BF506F_EZKIT=y
# CONFIG_CMD_BOOTM is not set

@ -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

@ -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

@ -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

@ -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

@ -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 */

Loading…
Cancel
Save