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>
25 lines
904 B
Diff
25 lines
904 B
Diff
From 1845b514511398cc0ba219a47958f078a2f7f67d Mon Sep 17 00:00:00 2001
|
|
From: Shiji Yang <yangshiji66@outlook.com>
|
|
Date: Tue, 8 Jul 2025 19:50:53 +0800
|
|
Subject: [PATCH] arm: mediatek: add back mt7622 LK image header
|
|
|
|
The LK image header was lost since commit df3ab898f644
|
|
("arm: mediatek: merge board Kconfigs into mach-mediatek").
|
|
|
|
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
|
|
---
|
|
arch/arm/mach-mediatek/Kconfig | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/arch/arm/mach-mediatek/Kconfig
|
|
+++ b/arch/arm/mach-mediatek/Kconfig
|
|
@@ -166,7 +166,7 @@ config MTK_BROM_HEADER_INFO
|
|
string
|
|
default "media=nor" if TARGET_MT8518 || TARGET_MT8512 || TARGET_MT7629
|
|
default "media=emmc" if TARGET_MT8516 || TARGET_MT8365 || TARGET_MT8183 || TARGET_MT8188
|
|
- default "lk=1" if TARGET_MT7623
|
|
+ default "lk=1" if TARGET_MT7622 || TARGET_MT7623
|
|
|
|
config MTK_TZ_MOVABLE
|
|
select ARCH_MISC_INIT
|