Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit dba1697057abed60bcb46ff724dad9f3e090c566

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent b0928da648
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 7 changed files with 9 additions and 3 deletions Side-by-side Diff

1 1 menu "Command line interface"
2 2 depends on !SPL_BUILD
3 3  
  4 +config CMD_BOOTM
  5 + bool "Enable bootm command"
  6 + default y
  7 + help
  8 + Boot an application image from the memory.
  9 +
4 10 endmenu
configs/bf506f-ezkit_defconfig
Diff comments   View file @ dba1697
1 1 CONFIG_BLACKFIN=y
2 2 CONFIG_TARGET_BF506F_EZKIT=y
  3 +# CONFIG_CMD_BOOTM is not set
configs/controlcenterd_TRAILBLAZER_DEVELOP_defconfig
Diff comments   View file @ dba1697
... ... @@ -2,4 +2,5 @@
2 2 CONFIG_PPC=y
3 3 CONFIG_MPC85xx=y
4 4 CONFIG_TARGET_CONTROLCENTERD=y
  5 +# CONFIG_CMD_BOOTM is not set
configs/controlcenterd_TRAILBLAZER_defconfig
Diff comments   View file @ dba1697
... ... @@ -2,4 +2,5 @@
2 2 CONFIG_PPC=y
3 3 CONFIG_MPC85xx=y
4 4 CONFIG_TARGET_CONTROLCENTERD=y
  5 +# CONFIG_CMD_BOOTM is not set
include/config_cmd_defaults.h
Diff comments   View file @ dba1697
... ... @@ -9,7 +9,6 @@
9 9 #ifndef _CONFIG_CMD_DEFAULTS_H_
10 10 #define _CONFIG_CMD_DEFAULTS_H_
11 11  
12   -#define CONFIG_CMD_BOOTM 1
13 12 #define CONFIG_CMD_CRC32 1
14 13 #define CONFIG_CMD_EXPORTENV 1
15 14 #define CONFIG_CMD_GO 1
include/configs/bf506f-ezkit.h
Diff comments   View file @ dba1697
... ... @@ -102,7 +102,6 @@
102 102 #define CONFIG_CMD_MEMORY
103 103 #undef CONFIG_GZIP
104 104 #undef CONFIG_ZLIB
105   -#undef CONFIG_CMD_BOOTM
106 105 #undef CONFIG_BOOTM_RTEMS
107 106 #undef CONFIG_BOOTM_LINUX
108 107  
include/configs/controlcenterd.h
Diff comments   View file @ dba1697
... ... @@ -434,7 +434,6 @@
434 434 #define CONFIG_BOARD_EARLY_INIT_F
435 435 #define CONFIG_BOARD_EARLY_INIT_R
436 436 #define CONFIG_LAST_STAGE_INIT
437   -#undef CONFIG_CMD_BOOTM
438 437  
439 438 #endif /* CONFIG_TRAILBLAZER */
440 439