colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

menu: remove CTRL+C to quit

Browse Source 
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>
This commit is contained in:
Masahisa Kojima
2023-02-02 18:24:43 +09:00
committed by Heinrich Schuchardt
parent 1dd705cf99
commit 45f5319fa6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/bootmenu.c
View File

@@ -437,7 +437,7 @@ static void menu_display_statusline(struct menu *m)
printf(ANSI_CURSOR_POSITION, menu->count + 5, 1); printf(ANSI_CURSOR_POSITION, menu->count + 5, 1);
puts(ANSI_CLEAR_LINE); puts(ANSI_CLEAR_LINE);
printf(ANSI_CURSOR_POSITION, menu->count + 6, 3); 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); puts(ANSI_CLEAR_LINE_TO_END);
printf(ANSI_CURSOR_POSITION, menu->count + 7, 1); printf(ANSI_CURSOR_POSITION, menu->count + 7, 1);
puts(ANSI_CLEAR_LINE); puts(ANSI_CLEAR_LINE);

6
cmd/eficonfig.c
View File

@@ -23,12 +23,12 @@
static struct efi_simple_text_input_protocol *cin; static struct efi_simple_text_input_protocol *cin;
const char *eficonfig_menu_desc = 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 = static const char *eficonfig_change_boot_order_desc =
" Press UP/DOWN to move, +/- to change orde\n" " Press UP/DOWN to move, +/- to change orde\n"
" Press SPACE to activate or deactivate the entry\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 struct efi_simple_text_output_protocol *cout;
static int avail_row; static int avail_row;
@@ -927,7 +927,7 @@ static efi_status_t handle_user_input(u16 *buf, int buf_size,
ANSI_CURSOR_POSITION ANSI_CURSOR_POSITION
"%s" "%s"
ANSI_CURSOR_POSITION ANSI_CURSOR_POSITION
" Press ENTER to complete, ESC/CTRL+C to quit", " Press ENTER to complete, ESC to quit",
0, 1, msg, 8, 1); 0, 1, msg, 8, 1);
/* tmp is used to accept user cancel */ /* tmp is used to accept user cancel */

2
doc/usage/cmd/bootmenu.rst
View File

@@ -122,7 +122,7 @@ Example bootmenu is as below::
Default behavior when user exits from the bootmenu Default behavior when user exits from the bootmenu
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
User can exit from bootmenu by selecting the last entry 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, When the CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE is disabled,
user exits from the bootmenu and returns to the U-Boot console. user exits from the bootmenu and returns to the U-Boot console.