]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
cmd: bootmenu: rename U-Boot console to Exit
authorSvyatoslav Ryhel <clamor95@gmail.com>
Wed, 17 Jan 2024 10:55:46 +0000 (12:55 +0200)
committerTom Rini <trini@konsulko.com>
Wed, 24 Jan 2024 16:12:11 +0000 (11:12 -0500)
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>
cmd/bootmenu.c

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