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>

diff --git a/boot/Kconfig b/boot/Kconfig
index dff4d23b887e88e7395764ca329228dff5377d2e..08451c65a56b9c6882f71faa47ebf74259653b23 100644 (file)
--- 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

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 69c1814d24af2da75884c55056097c325b14d7ac..09193b61b95f4b07818081f9c7addee12d3e5773 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -357,16 +357,6 @@ config CMD_BOOTMENU
        help
          Add an ANSI terminal boot menu command.
 
-config CMD_BOOTMENU_ENTER_UBOOT_CONSOLE
-       bool "Allow Bootmenu to enter the U-Boot console"
-       depends on CMD_BOOTMENU
-       default n
-       help
-         Add an entry to enter U-Boot console in bootmenu.
-         If this option is disabled, user can not enter
-         the U-Boot console from bootmenu. It increases
-         the system security.
-
 config CMD_ADTIMG
        bool "adtimg"
        help

diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index 8859eebea503c3e006c17dce64b79d512e72d9d2..c59f5db464ced540f7624218a0f61a0353562184 100644 (file)
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -356,7 +356,7 @@ static struct bootmenu_data *bootmenu_create(int delay)
                        goto cleanup;
 
                /* Add Quit entry if entering U-Boot console is disabled */
-               if (IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE))
+               if (!IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE))
                        entry->title = u16_strdup(u"U-Boot console");
                else
                        entry->title = u16_strdup(u"Quit");
@@ -589,7 +589,7 @@ int menu_show(int bootdelay)
                if (ret == BOOTMENU_RET_UPDATED)
                        continue;
 
-               if (!IS_ENABLED(CONFIG_CMD_BOOTMENU_ENTER_UBOOT_CONSOLE)) {
+               if (IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE)) {
                        if (ret == BOOTMENU_RET_QUIT) {
                                /* default boot process */
                                if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR))