Shiji YangandDaniel Golle
b6ecbb0374
Remove upstreamed patches: 001-pinctrl-mediatek-MT7981-fix-GPIO9-register-map.patch [1] 010-clk-mediatek-mt7622-fix-infracfg-and-pericfg-clock-o.patch [2] We also need to backport two new patches from v2026.07-rc2 to address the yaml build error[3] and MT7621 boot issue[4]. [1] https://github.com/u-boot/u-boot/commit/a1d1fc8d8c8699d80e1b9ab3214752e5882d3740 [2] https://github.com/u-boot/u-boot/commit/52d84fccfd7d8b99e91a70192eec8e0379d63b4b [3] https://github.com/u-boot/u-boot/commit/8ef8dee4f3a2b2021decfefd853dbd2a1632b77f [4] https://github.com/u-boot/u-boot/commit/de79075f0f6b8795d1f9e30ff36435583b1a119a Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
44 lines
1.1 KiB
Diff
44 lines
1.1 KiB
Diff
From de79075f0f6b8795d1f9e30ff36435583b1a119a Mon Sep 17 00:00:00 2001
|
|
From: Shiji Yang <yangshiji66@outlook.com>
|
|
Date: Sun, 12 Apr 2026 20:12:25 +0800
|
|
Subject: [PATCH] mips: mtmips: align MT7621 image blobs to 8-byte boundary
|
|
|
|
MT7621 doesn't boot on u-boot v2026.04. Fix it by correcting the
|
|
u-boot aligned offset.
|
|
|
|
Fixes: d9e183a04c92 ("MIPS: Assure end of U-Boot is at 8-byte aligned offset")
|
|
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
|
|
Reviewed-by: Weijie Gao <weijie.gao@mediatek.com>
|
|
---
|
|
arch/mips/dts/mt7621-u-boot.dtsi | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/arch/mips/dts/mt7621-u-boot.dtsi
|
|
+++ b/arch/mips/dts/mt7621-u-boot.dtsi
|
|
@@ -47,13 +47,13 @@
|
|
|
|
&binman {
|
|
u-boot-spl-ddr {
|
|
- align = <4>;
|
|
- align-size = <4>;
|
|
+ align = <8>;
|
|
+ align-size = <8>;
|
|
filename = "u-boot-spl-ddr.bin";
|
|
pad-byte = <0xff>;
|
|
|
|
u-boot-spl {
|
|
- align-end = <4>;
|
|
+ align-end = <8>;
|
|
filename = "u-boot-spl.bin";
|
|
};
|
|
|
|
@@ -90,7 +90,7 @@
|
|
|
|
#ifndef CONFIG_MT7621_BOOT_FROM_NAND
|
|
u-boot-tpl {
|
|
- align-end = <4>;
|
|
+ align-end = <8>;
|
|
filename = "u-boot-tpl.bin";
|
|
};
|
|
#endif
|