[PATCH v1 1/1] cmd: bootmenu: rename U-Boot console to Exit

[Peter Robinson]

On Sun, 14 Jan 2024 at 10:23, Svyatoslav Ryhel <clamor95 at gmail.com> wrote:
>
> 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. Hense, let's remove ambiguity and name this

Hence

> entry by what it actually does: 'Exit' the bootmenu.
>
> Signed-off-by: Svyatoslav Ryhel <clamor95 at gmail.com>
> ---
>  cmd/bootmenu.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c
> index 987b16889f..69fca710a8 100644
> --- a/cmd/bootmenu.c
> +++ b/cmd/bootmenu.c
> @@ -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 - Exit */

I think just put "Set the last entry to Exit"

>                         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 to U-Boot console is disabled */

s/Quit/Exit/

>                 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 is Exit or Quit */

"Last entry is Exit" as I don't see Quit referred to.

>                 if (iter->num == iter->menu->count - 1) {
>                         ret = BOOTMENU_RET_QUIT;
>                         goto cleanup;
> --
> 2.40.1
>