[U-Boot] [PATCH 15/18] Convert CONFIG_AUTOBOOT_MENU_SHOW to Kconfig
Simon Glass
sjg at chromium.org
Sun May 5 21:53:39 UTC 2019
This converts the following to Kconfig:
CONFIG_AUTOBOOT_MENU_SHOW
Signed-off-by: Simon Glass <sjg at chromium.org>
---
cmd/Kconfig | 8 ++++++++
configs/nokia_rx51_defconfig | 1 +
include/configs/nokia_rx51.h | 2 --
include/configs/vexpress_aemv8a.h | 2 --
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 244f4ff2531..35201f28c65 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -170,6 +170,14 @@ config AUTOBOOT_MENUKEY
For example, 33 means "!" in ASCII, so pressing ! at boot would take
this action.
+config AUTOBOOT_MENU_SHOW
+ bool "Show a menu on boot"
+ help
+ This enables the boot menu, controlled by environment variables
+ defined by the board. The menu starts after running the 'preboot'
+ environmnent variable (if enabled) and before handling the boot delay.
+ See README.bootmenu for more details.
+
endmenu
config BUILD_BIN2C
diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 5cd96017e5d..ab5bb2de6f3 100644
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="Nokia RX-51 # "
CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_MENU_SHOW=y
CONFIG_CMD_BOOTMENU=y
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_SAVEENV is not set
diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 1cd7fc54906..3d9b9f9310d 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -271,8 +271,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
"run attachboot;" \
"echo"
-#define CONFIG_AUTOBOOT_MENU_SHOW
-
/*
* Miscellaneous configurable options
*/
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
index 2b1269de837..89cd8b550ae 100644
--- a/include/configs/vexpress_aemv8a.h
+++ b/include/configs/vexpress_aemv8a.h
@@ -110,8 +110,6 @@
#define CONFIG_PL011_CLOCK 24000000
#endif
-/*#define CONFIG_AUTOBOOT_MENU_SHOW*/
-
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
--
2.21.0.1020.gf2820cf01a-goog
More information about the U-Boot
mailing list