summaryrefslogtreecommitdiff
path: root/boot/Kconfig
diff options
context:
space:
mode:
authorMasahisa Kojima <masahisa.kojima@linaro.org>2022-05-26 19:09:38 +0900
committerHeinrich Schuchardt <heinrich.schuchardt@canonical.com>2022-05-28 10:59:27 +0200
commit83f73632c9dd8ee2a6f67b0d1086c5b1ed95bd2f (patch)
treed515f6585a108210bd923ffc4adf4ae627b18404 /boot/Kconfig
parenta24b20ea67f0fac7ab139769a9ff478d4fd1edda (diff)
bootmenu: U-Boot console is enabled as default
The commit 2158b0da220c ("bootmenu: add Kconfig option not to enter U-Boot console") disables to enter U-Boot console from bootmenu as default, this change affects the existing bootmenu users. This commit reverts the default behavior, the bootmenu can enter U-Boot console same as before. CMD_BOOTMENU_ENTER_UBOOT_CONSOLE is renamed BOOTMENU_DISABLE_UBOOT_CONSOLE and depends on AUTOBOOT_MENU_SHOW. Fixes: 2158b0da220c ("bootmenu: add Kconfig option not to enter U-Boot console") Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org> Tested-by: Pali Rohar <pali@kernel.org> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Diffstat (limited to 'boot/Kconfig')
-rw-r--r--boot/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/boot/Kconfig b/boot/Kconfig
index dff4d23b88..08451c65a5 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -1143,6 +1143,13 @@ config AUTOBOOT_MENU_SHOW
environmnent variable (if enabled) and before handling the boot delay.
See README.bootmenu for more details.
+config BOOTMENU_DISABLE_UBOOT_CONSOLE
+ bool "Disallow bootmenu to enter the U-Boot console"
+ depends on AUTOBOOT_MENU_SHOW
+ help
+ If this option is enabled, user can not enter the U-Boot console from
+ bootmenu. It increases the system security.
+
config BOOT_RETRY
bool "Boot retry feature"
help