diff options
author | Daniel Golle <daniel@makrotopia.org> | 2021-02-20 13:04:38 +0000 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2021-03-11 16:24:53 +0000 |
commit | 9dfc2b3ca4dff28259576e21bc3ade910ff52a05 (patch) | |
tree | bc7a3bbea0fa638ece89027d3f04fcd0d09a9359 /package/boot/uboot-mediatek/patches/211-cmd-bootmenu-custom-title.patch | |
parent | e2cffbb80528b1c13bbaba6e53835de378ef3923 (diff) | |
download | upstream-9dfc2b3ca4dff28259576e21bc3ade910ff52a05.tar.gz upstream-9dfc2b3ca4dff28259576e21bc3ade910ff52a05.tar.bz2 upstream-9dfc2b3ca4dff28259576e21bc3ade910ff52a05.zip |
uboot-mediatek: update to 2021.04-rc3 with MediaTek's patches
MediaTek published their current U-Boot patchset on github:
https://github.com/mtk-openwrt/u-boot/commits/mtksoc
Import the platform patches from there (`00-mtk-*.patch`), arrange,
them nicely, drop no longer needed local patches and rebase on top of
U-Boot 2021.04-rc3.
Tested and works well on Linksys E8450 (snand-1ddr) as well as
Bananapi BPi-R64 (sdmmc-2ddr, emmc-2ddr).
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/boot/uboot-mediatek/patches/211-cmd-bootmenu-custom-title.patch')
-rw-r--r-- | package/boot/uboot-mediatek/patches/211-cmd-bootmenu-custom-title.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/package/boot/uboot-mediatek/patches/211-cmd-bootmenu-custom-title.patch b/package/boot/uboot-mediatek/patches/211-cmd-bootmenu-custom-title.patch new file mode 100644 index 0000000000..3f98f13c6e --- /dev/null +++ b/package/boot/uboot-mediatek/patches/211-cmd-bootmenu-custom-title.patch @@ -0,0 +1,32 @@ +--- a/cmd/bootmenu.c ++++ b/cmd/bootmenu.c +@@ -39,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 */ ++ char *mtitle; /* custom menu title */ + bool last_choiced; + }; + +@@ -471,7 +472,12 @@ static void menu_display_statusline(stru + printf(ANSI_CURSOR_POSITION, 1, 1); + puts(ANSI_CLEAR_LINE); + printf(ANSI_CURSOR_POSITION, 2, 1); +- 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); +@@ -525,6 +531,7 @@ static void bootmenu_show(int delay) + return; + } + ++ bootmenu->mtitle = env_get("bootmenu_title"); + for (iter = bootmenu->first; iter; iter = iter->next) { + if (!menu_item_add(menu, iter->key, iter)) + goto cleanup; |