Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-16 18:04:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd: bootmenu: rename U-Boot console to Exit

Browse source 
It seems that the U-Boot console entry of the bootmenu has lost
its original meaning. Now, even if it is chosen, the probability
that you will enter the actual U-Boot console is quite low.
Boot env, bootflow, bootcommand script may appear, but not the
actual console. Hence, let's remove ambiguity and name this
entry by what it actually does: 'Exit' the bootmenu.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
This commit is contained in:
Svyatoslav Ryhel 2024-01-17 12:55:46 +02:00 • committed by Tom Rini
parent d2099587d6
commit 983d6e5bf0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/bootmenu.c
View file

@ -119,7 +119,7 @@ static char *bootmenu_choice_entry(void *data)
iter = iter->next; iter = iter->next;
return iter->key; return iter->key;
case BKEY_QUIT: case BKEY_QUIT:
/* Quit by choosing the last entry - U-Boot console */ /* Quit by choosing the last entry */
iter = menu->first; iter = menu->first;
while (iter->next) while (iter->next)
iter = iter->next; iter = iter->next;
@ -361,15 +361,15 @@ static struct bootmenu_data *bootmenu_create(int delay)
} }
#endif #endif
/* Add U-Boot console entry at the end */ /* Add Exit entry at the end */
if (i <= MAX_COUNT - 1) { if (i <= MAX_COUNT - 1) {
entry = malloc(sizeof(struct bootmenu_entry)); entry = malloc(sizeof(struct bootmenu_entry));
if (!entry) if (!entry)
goto cleanup; goto cleanup;
/* Add Quit entry if entering U-Boot console is disabled */ /* Add Quit entry if exiting bootmenu is disabled */
if (!IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE)) if (!IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE))
entry->title = strdup("U-Boot console"); entry->title = strdup("Exit");
else else
entry->title = strdup("Quit"); entry->title = strdup("Quit");
@ -532,7 +532,7 @@ static enum bootmenu_ret bootmenu_show(int delay)
title = strdup(iter->title); title = strdup(iter->title);
command = strdup(iter->command); command = strdup(iter->command);
/* last entry is U-Boot console or Quit */ /* last entry exits bootmenu */
if (iter->num == iter->menu->count - 1) { if (iter->num == iter->menu->count - 1) {
ret = BOOTMENU_RET_QUIT; ret = BOOTMENU_RET_QUIT;
goto cleanup; goto cleanup;