mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
50f7c5af4a
Update to next U-Boot timed release. Remove now obsolete patch 100-01-board-mediatek-add-more-network-configurations.patch Default IP addresses are now dealt with in Kconfig, no longer in board- specific C header files. Add patches to restore ANSI support in bootmenu which was broken upstream, always use high-speed mode on serial UART for improved stability and fix an issue with pinconf not being applied on MT7623 resulting in eMMC being inaccessible when booting from micro SD card. In order to keep the size of the bootloader on MT7623 below 512kB remove some unneeded commands on both MT7623 boards. Tested on: * BananaPi BPi-R2 (MT7623N) * BananaPi BPi-R3 (MT7986A) * BananaPi BPi-R64 (MT7622A) * Linksys E8450 (MT7622B) Signed-off-by: Daniel Golle <daniel@makrotopia.org>
34 lines
993 B
Diff
34 lines
993 B
Diff
--- a/cmd/bootmenu.c
|
|
+++ b/cmd/bootmenu.c
|
|
@@ -452,7 +452,11 @@ static void menu_display_statusline(stru
|
|
printf(ANSI_CURSOR_POSITION, 1, 1);
|
|
puts(ANSI_CLEAR_LINE);
|
|
printf(ANSI_CURSOR_POSITION, 2, 3);
|
|
- puts("*** U-Boot Boot Menu ***");
|
|
+ if (menu->mtitle)
|
|
+ puts(menu->mtitle);
|
|
+ else
|
|
+ puts(" *** U-Boot Boot Menu ***");
|
|
+
|
|
puts(ANSI_CLEAR_LINE_TO_END);
|
|
printf(ANSI_CURSOR_POSITION, 3, 1);
|
|
puts(ANSI_CLEAR_LINE);
|
|
@@ -537,6 +541,7 @@ static enum bootmenu_ret bootmenu_show(i
|
|
return BOOTMENU_RET_FAIL;
|
|
}
|
|
|
|
+ bootmenu->mtitle = env_get("bootmenu_title");
|
|
for (iter = bootmenu->first; iter; iter = iter->next) {
|
|
if (menu_item_add(menu, iter->key, iter) != 1)
|
|
goto cleanup;
|
|
--- a/include/menu.h
|
|
+++ b/include/menu.h
|
|
@@ -45,6 +45,7 @@ struct bootmenu_data {
|
|
int active; /* 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;
|
|
};
|
|
|