Skip to contentSkip to conversation

bootmenu: rename U-Boot console to Exit

PATCH Superseded Svyatoslav Ryhel 2 participants 4 messages Jan 14, 2024

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover bootmenu: rename U-Boot console to Exit

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 entry by what it actually does: 'Exit' the bootmenu.

Svyatoslav Ryhel (1):
cmd: bootmenu: rename U-Boot console to Exit

 cmd/bootmenu.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
2.40.1
#1 lore raw

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

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 entry by what it actually does: 'Exit' the bootmenu.

---
 cmd/bootmenu.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
cmd/bootmenu.c +5 -5
index 987b16889f..69fca710a8 100644
@@ -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 */
 			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 */
 		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 */
 		if (iter->num == iter->menu->count - 1) {
 			ret = BOOTMENU_RET_QUIT;
 			goto cleanup;
Signature · 1 line
2.40.1
#2 lore raw

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

Quoted 6 lines · Svyatoslav Ryhel

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

Quoted 12 lines

entry by what it actually does: 'Exit' the bootmenu.

---
 cmd/bootmenu.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
cmd/bootmenu.c +0 -0
index 987b16889f..69fca710a8 100644

cmd/bootmenu.c static char *bootmenu_choice_entry(void *data) · line 122

Quoted 5 lines
cmd/bootmenu.c +1 -1
@@ -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"

Quoted 6 lines
cmd/bootmenu.c +0 -0
                        iter = menu->first;
                        while (iter->next)
                                iter = iter->next;
@@ -361,15 +361,15 @@ static struct bootmenu_data *bootmenu_create(int delay)
        }
 #endif

cmd/bootmenu.c static struct bootmenu_data *bootmenu_create(int delay) · line 370

Quoted 10 lines
cmd/bootmenu.c +2 -2
 
-       /* 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/

cmd/bootmenu.c static enum bootmenu_ret bootmenu_show(int delay) · line 535

Quoted 12 lines
cmd/bootmenu.c +2 -2
                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.

Quoted 6 lines
cmd/bootmenu.c +0 -1
                if (iter->num == iter->menu->count - 1) {
                        ret = BOOTMENU_RET_QUIT;
                        goto cleanup;
--

2.40.1

author
#3 lore raw

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

14 січня 2024 р. 16:41:40 GMT+02:00, Peter Robinson <[email protected]> написав(-ла):

Quoted 10 lines · Svyatoslav Ryhel
Quoted 6 lines

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

Fair

Quoted 7 lines
Quoted 7 lines

entry by what it actually does: 'Exit' the bootmenu.

---
 cmd/bootmenu.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Quoted 13 lines

cmd/bootmenu.c static char *bootmenu_choice_entry(void *data) · line 122

Quoted 10 lines
cmd/bootmenu.c +1 -1
index 987b16889f..69fca710a8 100644
@@ -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"

It can be either Quit or U-Boot console. Since U-Boot console is renamed by this patch, all references in comments are replaced with Exit.

Quoted 25 lines
Quoted 6 lines
cmd/bootmenu.c +0 -0
                        iter = menu->first;
                        while (iter->next)
                                iter = iter->next;
@@ -361,15 +361,15 @@ static struct bootmenu_data *bootmenu_create(int delay)
        }
 #endif

cmd/bootmenu.c static struct bootmenu_data *bootmenu_create(int delay) · line 370

Quoted 10 lines
cmd/bootmenu.c +2 -2
 
-       /* 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/

Quoted 6 lines
cmd/bootmenu.c +1 -1
                if (!IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE))
-                       entry->title = strdup("U-Boot console");
+                       entry->title = strdup("Exit");
                else
                        entry->title = strdup("Quit");
 
Quoted 9 lines

cmd/bootmenu.c static enum bootmenu_ret bootmenu_show(int delay) · line 535

Quoted 6 lines
cmd/bootmenu.c +1 -1
@@ -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.

Check above.

Quoted 6 lines
Quoted 6 lines
cmd/bootmenu.c +0 -1
                if (iter->num == iter->menu->count - 1) {
                        ret = BOOTMENU_RET_QUIT;
                        goto cleanup;
--

2.40.1