Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit cf9803a60b27da7958f6abc9b42e58f3783f5880

Authored by Simon Glass
Committed by Tom Rini
1 parent e231306e48
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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_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

Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig 

This converts the following to Kconfig:
   CONFIG_AUTOBOOT_MENU_SHOW

Signed-off-by: Simon Glass <sjg@chromium.org>

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

... ... @@ -170,6 +170,14 @@
170 170 For example, 33 means "!" in ASCII, so pressing ! at boot would take
171 171 this action.
172 172  
  173 +config AUTOBOOT_MENU_SHOW
  174 + bool "Show a menu on boot"
  175 + help
  176 + This enables the boot menu, controlled by environment variables
  177 + defined by the board. The menu starts after running the 'preboot'
  178 + environmnent variable (if enabled) and before handling the boot delay.
  179 + See README.bootmenu for more details.
  180 +
173 181 endmenu
174 182  
175 183 config BUILD_BIN2C
configs/nokia_rx51_defconfig
Diff comments   View file @ cf9803a
... ... @@ -12,6 +12,7 @@
12 12 CONFIG_HUSH_PARSER=y
13 13 CONFIG_SYS_PROMPT="Nokia RX-51 # "
14 14 CONFIG_AUTOBOOT_KEYED=y
  15 +CONFIG_AUTOBOOT_MENU_SHOW=y
15 16 CONFIG_CMD_BOOTMENU=y
16 17 # CONFIG_CMD_IMI is not set
17 18 # CONFIG_CMD_SAVEENV is not set
include/configs/nokia_rx51.h
Diff comments   View file @ cf9803a
... ... @@ -270,8 +270,6 @@
270 270 "run attachboot;" \
271 271 "echo"
272 272  
273   -#define CONFIG_AUTOBOOT_MENU_SHOW
274   -
275 273 /*
276 274 * Miscellaneous configurable options
277 275 */
include/configs/vexpress_aemv8a.h
Diff comments   View file @ cf9803a
... ... @@ -110,8 +110,6 @@
110 110 #define CONFIG_PL011_CLOCK 24000000
111 111 #endif
112 112  
113   -/*#define CONFIG_AUTOBOOT_MENU_SHOW*/
114   -
115 113 /* BOOTP options */
116 114 #define CONFIG_BOOTP_BOOTFILESIZE
117 115