summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-09-16 16:33:00 +0900
committerTom Rini <trini@ti.com>2014-09-24 18:30:28 -0400
commitdba1697057abed60bcb46ff724dad9f3e090c566 (patch)
treec4c832cf17fc05ab564fb54a67f390d043b1e91d /include
parentb0928da648d440778512ddd81e690717239b8f1f (diff)
downloadblackbird-obmc-uboot-dba1697057abed60bcb46ff724dad9f3e090c566.tar.gz
blackbird-obmc-uboot-dba1697057abed60bcb46ff724dad9f3e090c566.zip
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>
Diffstat (limited to 'include')
-rw-r--r--include/config_cmd_defaults.h1
-rw-r--r--include/configs/bf506f-ezkit.h1
-rw-r--r--include/configs/controlcenterd.h1
3 files changed, 0 insertions, 3 deletions
diff --git a/include/config_cmd_defaults.h b/include/config_cmd_defaults.h
index a55b268b9b..8e3d5b4c82 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 5db181984f..fdd10c3a98 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 7eaaf69951..bfcfa0c8c9 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 */
OpenPOWER on IntegriCloud