uboot-mediatek: sync mtk-openwrt open source u-boot patches
Synchronize the latest MTK u-boot patches[1]. Some patches have been amended since last synchronization. Changes: * Minor NMBM layer fixes and improvements. * A new bootmenu shortkey implementation. * New SPI flash support for en25qx128. [1] https://github.com/mtk-openwrt/u-boot/tree/mtksoc-20230719 Signed-off-by: Shiji Yang <yangshiji66@qq.com>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/cmd/bootmenu.c
|
||||
+++ b/cmd/bootmenu.c
|
||||
@@ -465,7 +465,11 @@ static void menu_display_statusline(stru
|
||||
@@ -463,7 +463,11 @@ static void menu_display_statusline(stru
|
||||
printf(ANSI_CURSOR_POSITION, 1, 1);
|
||||
puts(ANSI_CLEAR_LINE);
|
||||
printf(ANSI_CURSOR_POSITION, 2, 3);
|
||||
@@ -13,7 +13,7 @@
|
||||
puts(ANSI_CLEAR_LINE_TO_END);
|
||||
printf(ANSI_CURSOR_POSITION, 3, 1);
|
||||
puts(ANSI_CLEAR_LINE);
|
||||
@@ -550,6 +554,7 @@ static enum bootmenu_ret bootmenu_show(i
|
||||
@@ -548,6 +552,7 @@ static enum bootmenu_ret bootmenu_show(i
|
||||
return BOOTMENU_RET_FAIL;
|
||||
}
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
goto cleanup;
|
||||
--- a/include/menu.h
|
||||
+++ b/include/menu.h
|
||||
@@ -47,6 +47,7 @@ struct bootmenu_data {
|
||||
@@ -45,6 +45,7 @@ struct bootmenu_data {
|
||||
int last_active; /* last active menu entry */
|
||||
int count; /* total count of menu entries */
|
||||
struct bootmenu_entry *first; /* first menu entry */
|
||||
+ char *mtitle; /* custom menu title */
|
||||
bool last_choiced;
|
||||
};
|
||||
|
||||
/** enum bootmenu_key - keys that can be returned by the bootmenu */
|
||||
|
||||
Reference in New Issue
Block a user