menu: remove CTRL+C to quit

On the sandbox called without "--terminal raw" CTRL+C leaves U-Boot,
"ESC/CTRL+C to quit" is misleading.

Let's remove CTRL+C to quit key handling from bootmenu and eficonfig menu.

Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
index 3236ca5d799497beb3e85f39057a7bdfdc9ae2d6..8dc133c23621e7991d00a04bb99524d2a7ba8ec5 100644 (file)
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
@@ -437,7 +437,7 @@ static void menu_display_statusline(struct menu *m)
        printf(ANSI_CURSOR_POSITION, menu->count + 5, 1);
        puts(ANSI_CLEAR_LINE);
        printf(ANSI_CURSOR_POSITION, menu->count + 6, 3);
-       puts("Press UP/DOWN to move, ENTER to select, ESC/CTRL+C to quit");
+       puts("Press UP/DOWN to move, ENTER to select, ESC to quit");
        puts(ANSI_CLEAR_LINE_TO_END);
        printf(ANSI_CURSOR_POSITION, menu->count + 7, 1);
        puts(ANSI_CLEAR_LINE);

diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c
index 47c04cf536303c3282027174d08f24f26cfbc503..f365a988d4de024823c4f563e73288883551c026 100644 (file)
--- a/cmd/eficonfig.c
+++ b/cmd/eficonfig.c
@@ -23,12 +23,12 @@
 
 static struct efi_simple_text_input_protocol *cin;
 const char *eficonfig_menu_desc =
-       "  Press UP/DOWN to move, ENTER to select, ESC/CTRL+C to quit";
+       "  Press UP/DOWN to move, ENTER to select, ESC to quit";
 
 static const char *eficonfig_change_boot_order_desc =
        "  Press UP/DOWN to move, +/- to change orde\n"
        "  Press SPACE to activate or deactivate the entry\n"
-       "  Select [Save] to complete, ESC/CTRL+C to quit";
+       "  Select [Save] to complete, ESC to quit";
 
 static struct efi_simple_text_output_protocol *cout;
 static int avail_row;
@@ -927,7 +927,7 @@ static efi_status_t handle_user_input(u16 *buf, int buf_size,
               ANSI_CURSOR_POSITION
               "%s"
               ANSI_CURSOR_POSITION
-              "  Press ENTER to complete, ESC/CTRL+C to quit",
+              "  Press ENTER to complete, ESC to quit",
               0, 1, msg, 8, 1);
 
        /* tmp is used to accept user cancel */

diff --git a/doc/usage/cmd/bootmenu.rst b/doc/usage/cmd/bootmenu.rst
index cb3c8d2f93c49b6d78105349d94ad8cbf71c8e7a..684a18d8e1485ac870fe44d41760c31be8d131d4 100644 (file)
--- a/doc/usage/cmd/bootmenu.rst
+++ b/doc/usage/cmd/bootmenu.rst
@@ -122,7 +122,7 @@ Example bootmenu is as below::
 Default behavior when user exits from the bootmenu
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 User can exit from bootmenu by selecting the last entry
-"U-Boot console"/"Quit" or ESC/CTRL+C key.
+"U-Boot console"/"Quit" or ESC key.
 
 When the CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE is disabled,
 user exits from the bootmenu and returns to the U-Boot console.