aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-mediatek/patches/210-cmd-bootmenu-add-ability-to-select-item-by-shortkey.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/boot/uboot-mediatek/patches/210-cmd-bootmenu-add-ability-to-select-item-by-shortkey.patch')
-rw-r--r--package/boot/uboot-mediatek/patches/210-cmd-bootmenu-add-ability-to-select-item-by-shortkey.patch228
1 files changed, 127 insertions, 101 deletions
diff --git a/package/boot/uboot-mediatek/patches/210-cmd-bootmenu-add-ability-to-select-item-by-shortkey.patch b/package/boot/uboot-mediatek/patches/210-cmd-bootmenu-add-ability-to-select-item-by-shortkey.patch
index c43b542dcb..b7d064062c 100644
--- a/package/boot/uboot-mediatek/patches/210-cmd-bootmenu-add-ability-to-select-item-by-shortkey.patch
+++ b/package/boot/uboot-mediatek/patches/210-cmd-bootmenu-add-ability-to-select-item-by-shortkey.patch
@@ -12,7 +12,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
--- a/cmd/bootmenu.c
+++ b/cmd/bootmenu.c
-@@ -11,6 +11,7 @@
+@@ -14,6 +14,7 @@
#include <menu.h>
#include <watchdog.h>
#include <malloc.h>
@@ -20,28 +20,94 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
#include <linux/delay.h>
#include <linux/string.h>
-@@ -38,6 +39,7 @@ struct bootmenu_data {
- int active; /* active menu entry */
- int count; /* total count of menu entries */
- struct bootmenu_entry *first; /* first menu entry */
-+ bool last_choiced;
- };
+@@ -87,16 +88,17 @@ static char *bootmenu_choice_entry(void
+ struct bootmenu_data *menu = data;
+ struct bootmenu_entry *iter;
+ enum bootmenu_key key = KEY_NONE;
++ int choice = -1;
+ int esc = 0;
+ int i;
- enum bootmenu_key {
-@@ -46,8 +48,27 @@ enum bootmenu_key {
- KEY_DOWN,
- KEY_SELECT,
- KEY_QUIT,
-+ KEY_CHOICE,
- };
+ while (1) {
+ if (menu->delay >= 0) {
+ /* Autoboot was not stopped */
+- bootmenu_autoboot_loop(menu, &key, &esc);
++ bootmenu_autoboot_loop(menu, &key, &esc, &choice);
+ } else {
+ /* Some key was pressed, so autoboot was stopped */
+- bootmenu_loop(menu, &key, &esc);
++ bootmenu_loop(menu, &key, &esc, &choice);
+ }
-+static const char choice_chars[] = {
-+ '1', '2', '3', '4', '5', '6', '7', '8', '9',
-+ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
-+ 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
-+ 'u', 'v', 'w', 'x', 'y', 'z'
-+};
+ switch (key) {
+@@ -110,6 +112,12 @@ static char *bootmenu_choice_entry(void
+ ++menu->active;
+ /* no menu key selected, regenerate menu */
+ return NULL;
++ case KEY_CHOICE:
++ menu->active = choice;
++ if (!menu->last_choiced) {
++ menu->last_choiced = true;
++ return NULL;
++ }
+ case KEY_SELECT:
+ iter = menu->first;
+ for (i = 0; i < menu->active; ++i)
+@@ -181,12 +189,19 @@ static int prepare_bootmenu_entry(struct
+ if (!entry)
+ return -ENOMEM;
+
+- entry->title = strndup(option, sep - option);
++ entry->title = malloc((sep - option) + 4);
+ if (!entry->title) {
+ free(entry);
+ return -ENOMEM;
+ }
+
++ if (i < ARRAY_SIZE(choice_chars)) {
++ sprintf(entry->title, "%c. %.*s", choice_chars[i],
++ (int)(sep - option), option);
++ } else {
++ sprintf(entry->title, " %.*s", (int)(sep - option), option);
++ }
+
+ entry->command = strdup(sep + 1);
+ if (!entry->command) {
+ free(entry->title);
+@@ -331,6 +346,7 @@ static struct bootmenu_data *bootmenu_cr
+ menu->delay = delay;
+ menu->active = 0;
+ menu->first = NULL;
++ menu->last_choiced = false;
+
+ default_str = env_get("bootmenu_default");
+ if (default_str)
+@@ -356,9 +372,9 @@ static struct bootmenu_data *bootmenu_cr
+
+ /* Add Quit entry if entering U-Boot console is disabled */
+ if (!IS_ENABLED(CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE))
+- entry->title = strdup("U-Boot console");
++ entry->title = strdup("0. U-Boot console");
+ else
+- entry->title = strdup("Quit");
++ entry->title = strdup("0. Quit");
+
+ if (!entry->title) {
+ free(entry);
+--- a/common/menu.c
++++ b/common/menu.c
+@@ -9,6 +9,7 @@
+ #include <cli.h>
+ #include <malloc.h>
+ #include <errno.h>
++#include <linux/ctype.h>
+ #include <linux/delay.h>
+ #include <linux/list.h>
+ #include <watchdog.h>
+@@ -47,6 +48,17 @@ struct menu {
+ int item_cnt;
+ };
+
+static int find_choice(char choice)
+{
+ int i;
@@ -53,19 +119,19 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
+ return -1;
+}
+
- static char *bootmenu_getoption(unsigned short int n)
- {
- char name[MAX_ENV_SIZE];
-@@ -82,7 +103,7 @@ static void bootmenu_print_entry(void *d
+ /*
+ * An iterator function for menu items. callback will be called for each item
+ * in m, with m, a pointer to the item, and extra being passed to callback. If
+@@ -426,7 +445,7 @@ int menu_destroy(struct menu *m)
}
- static void bootmenu_autoboot_loop(struct bootmenu_data *menu,
-- enum bootmenu_key *key, int *esc)
-+ enum bootmenu_key *key, int *esc, int *choice)
+ void bootmenu_autoboot_loop(struct bootmenu_data *menu,
+- enum bootmenu_key *key, int *esc)
++ enum bootmenu_key *key, int *esc, int *choice)
{
int i, c;
-@@ -115,6 +136,19 @@ static void bootmenu_autoboot_loop(struc
+@@ -456,6 +475,19 @@ void bootmenu_autoboot_loop(struct bootm
break;
default:
*key = KEY_NONE;
@@ -85,12 +151,12 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
break;
}
-@@ -136,10 +170,16 @@ static void bootmenu_autoboot_loop(struc
+@@ -475,10 +507,16 @@ void bootmenu_autoboot_loop(struct bootm
}
- static void bootmenu_loop(struct bootmenu_data *menu,
-- enum bootmenu_key *key, int *esc)
-+ enum bootmenu_key *key, int *esc, int *choice)
+ void bootmenu_loop(struct bootmenu_data *menu,
+- enum bootmenu_key *key, int *esc)
++ enum bootmenu_key *key, int *esc, int *choice)
{
int c;
@@ -103,7 +169,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
if (*esc == 1) {
if (tstc()) {
c = getchar();
-@@ -165,6 +205,14 @@ static void bootmenu_loop(struct bootmen
+@@ -504,6 +542,14 @@ void bootmenu_loop(struct bootmenu_data
if (c == '\e') {
*esc = 1;
*key = KEY_NONE;
@@ -118,75 +184,35 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
}
break;
case 1:
-@@ -216,16 +264,17 @@ static char *bootmenu_choice_entry(void
- struct bootmenu_data *menu = data;
- struct bootmenu_entry *iter;
- enum bootmenu_key key = KEY_NONE;
-+ int choice = -1;
- int esc = 0;
- int i;
-
- while (1) {
- if (menu->delay >= 0) {
- /* Autoboot was not stopped */
-- bootmenu_autoboot_loop(menu, &key, &esc);
-+ bootmenu_autoboot_loop(menu, &key, &esc, &choice);
- } else {
- /* Some key was pressed, so autoboot was stopped */
-- bootmenu_loop(menu, &key, &esc);
-+ bootmenu_loop(menu, &key, &esc, &choice);
- }
-
- switch (key) {
-@@ -239,6 +288,12 @@ static char *bootmenu_choice_entry(void
- ++menu->active;
- /* no menu key selected, regenerate menu */
- return NULL;
-+ case KEY_CHOICE:
-+ menu->active = choice;
-+ if (!menu->last_choiced) {
-+ menu->last_choiced = true;
-+ return NULL;
-+ }
- case KEY_SELECT:
- iter = menu->first;
- for (i = 0; i < menu->active; ++i)
-@@ -294,6 +349,7 @@ static struct bootmenu_data *bootmenu_cr
- menu->delay = delay;
- menu->active = 0;
- menu->first = NULL;
-+ menu->last_choiced = false;
+--- a/include/menu.h
++++ b/include/menu.h
+@@ -40,6 +40,7 @@ struct bootmenu_data {
+ int active; /* active menu entry */
+ int count; /* total count of menu entries */
+ struct bootmenu_entry *first; /* first menu entry */
++ bool last_choiced;
+ };
- default_str = env_get("bootmenu_default");
- if (default_str)
-@@ -311,12 +367,19 @@ static struct bootmenu_data *bootmenu_cr
- goto cleanup;
+ enum bootmenu_key {
+@@ -48,11 +49,19 @@ enum bootmenu_key {
+ KEY_DOWN,
+ KEY_SELECT,
+ KEY_QUIT,
++ KEY_CHOICE,
+ };
- len = sep-option;
-- entry->title = malloc(len + 1);
-+ entry->title = malloc(len + 4);
- if (!entry->title) {
- free(entry);
- goto cleanup;
- }
-- memcpy(entry->title, option, len);
+ void bootmenu_autoboot_loop(struct bootmenu_data *menu,
+- enum bootmenu_key *key, int *esc);
++ enum bootmenu_key *key, int *esc, int *choice);
+ void bootmenu_loop(struct bootmenu_data *menu,
+- enum bootmenu_key *key, int *esc);
++ enum bootmenu_key *key, int *esc, int *choice);
+
-+ if (i < ARRAY_SIZE(choice_chars)) {
-+ len = sprintf(entry->title, "%c. %.*s", choice_chars[i],
-+ len, option);
-+ } else {
-+ len = sprintf(entry->title, " %.*s", len, option);
-+ }
-+
- entry->title[len] = 0;
-
- len = strlen(sep + 1);
-@@ -353,7 +416,7 @@ static struct bootmenu_data *bootmenu_cr
- if (!entry)
- goto cleanup;
++static const char choice_chars[] = {
++ '1', '2', '3', '4', '5', '6', '7', '8', '9',
++ 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
++ 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
++ 'u', 'v', 'w', 'x', 'y', 'z'
++};
-- entry->title = strdup("U-Boot console");
-+ entry->title = strdup("0. U-Boot console");
- if (!entry->title) {
- free(entry);
- goto cleanup;
+ #endif /* __MENU_H__ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-14 02:08:33 +0000