Skip to content

Commit b1de81a

Browse files
blogicblogic
committed
patches-25.12: import MediaTek 25.12 SDK diff round 4
- 0179: revert MT7981/MT7986 kernel partition extension (drops three 999-dts-*-extend-to-end-support patches imported earlier in 0108) - 0180: add mt76 0098-cp-mtk-mt76-sync-common-part-for-connac2-support - 0181: add mt76 0099-cp-mtk-mt76-mt7915-add-connac2-support The mtk-openwrt-feeds commit a5d9ebd8 (wifi-scripts mac80211.uc fake single-wiphy cleanup) is deferred: the 8 lines it removes do not exist in openwrt-25.12 stock wifi-scripts and will be picked up via the planned feeds/mediatek/ overlay alongside the rest of MediaTek's wifi-scripts deltas. Signed-off-by: John Crispin <john@phrozen.org>
1 parent 590dcb2 commit b1de81a

3 files changed

Lines changed: 15875 additions & 0 deletions

‎patches-25.12/0179-Revert-MT7981-MT7986-Kernel-Partition-Extension-Sup.patch‎

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
From a55d77d87f92d416ac4c28f764034bd489f56c7b Mon Sep 17 00:00:00 2001
2+
From: Sam Shih <sam.shih@mediatek.com>
3+
Date: Tue, 26 May 2026 10:42:31 +0800
4+
Subject: [PATCH] Revert MT7981/MT7986 Kernel Partition Extension Support
5+
6+
This commit addresses the introduction of changes that extend the mtd
7+
partition used by the kernel in OpenWrt SDK. Due to the requirement for
8+
kernel mtd partitions to align with those used in the bootloader, and
9+
considering that customers may not be able to upgrade their bootloaders,
10+
this feature has been reverted. The reverted patches are aimed at
11+
preventing potential conflicts between the extended kernel partition
12+
and the bootloader's mtd partition.
13+
14+
The following patches have been deleted:
15+
- target/linux/mediatek/patches-6.12/999-dts-mt7981-rfb-08-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
16+
- target/linux/mediatek/patches-6.12/999-dts-mt7986a-bananapi-bpi-r3-01-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
17+
- target/linux/mediatek/patches-6.12/999-dts-mt7986a-rfb-13-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
18+
---
19+
...partition-size-extend-to-end-support.patch | 35 ---------
20+
...partition-size-extend-to-end-support.patch | 36 ----------
21+
...partition-size-extend-to-end-support.patch | 72 -------------------
22+
3 files changed, 143 deletions(-)
23+
delete mode 100644 target/linux/mediatek/patches-6.12/999-dts-mt7981-rfb-08-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
24+
delete mode 100644 target/linux/mediatek/patches-6.12/999-dts-mt7986a-bananapi-bpi-r3-01-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
25+
delete mode 100644 target/linux/mediatek/patches-6.12/999-dts-mt7986a-rfb-13-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
26+
27+
diff --git a/target/linux/mediatek/patches-6.12/999-dts-mt7981-rfb-08-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch b/target/linux/mediatek/patches-6.12/999-dts-mt7981-rfb-08-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
28+
deleted file mode 100644
29+
index 44f21ef171..0000000000
30+
--- a/target/linux/mediatek/patches-6.12/999-dts-mt7981-rfb-08-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
31+
+++ /dev/null
32+
@@ -1,35 +0,0 @@
33+
----
34+
-[v1] arm64: dts: mediatek: mt7981: Add mtd partition extend to end support
35+
-Add "mtd-extend-to-end" in mt7981 spim nand/nor related dts.
36+
-Partition with "mtd-extend-to-end" will extend to the end of
37+
-parent partiton and note that the size of partition in reg must be
38+
-set to 0 like reg = <0x0200000 0x0>.
39+
----
40+
-v1: Add mtd partition extend to end support.
41+
----
42+
-
43+
---- a/arch/arm64/boot/dts/mediatek/mt7981-rfb-spim-nand-nmbm.dtso
44+
-+++ b/arch/arm64/boot/dts/mediatek/mt7981-rfb-spim-nand-nmbm.dtso
45+
-@@ -53,8 +53,9 @@
46+
-
47+
- partition@780000 {
48+
- label = "ubi";
49+
-- reg = <0x580000 0x4000000>;
50+
-+ reg = <0x580000 0x0>;
51+
- compatible = "linux,ubi";
52+
-+ mtd-extend-to-end;
53+
-
54+
- volumes {
55+
- ubi_rootfs: ubi-volume-fit {
56+
---- a/arch/arm64/boot/dts/mediatek/mt7981-rfb-spim-nor.dtso
57+
-+++ b/arch/arm64/boot/dts/mediatek/mt7981-rfb-spim-nor.dtso
58+
-@@ -44,7 +44,8 @@
59+
- };
60+
- nor_rootfs: partition@180000 {
61+
- label = "firmware";
62+
-- reg = <0x180000 0x1e80000>;
63+
-+ reg = <0x180000 0x0>;
64+
-+ mtd-extend-to-end;
65+
- };
66+
- };
67+
- };
68+
diff --git a/target/linux/mediatek/patches-6.12/999-dts-mt7986a-bananapi-bpi-r3-01-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch b/target/linux/mediatek/patches-6.12/999-dts-mt7986a-bananapi-bpi-r3-01-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
69+
deleted file mode 100644
70+
index c11f002393..0000000000
71+
--- a/target/linux/mediatek/patches-6.12/999-dts-mt7986a-bananapi-bpi-r3-01-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
72+
+++ /dev/null
73+
@@ -1,36 +0,0 @@
74+
----
75+
-[v1] arm64: dts: mediatek: mt7986a: Add mtd partition extend to end support
76+
-Add "mtd-extend-to-end" in mt7986a bananapi r3 spim nand/nor related dts.
77+
-Partition with "mtd-extend-to-end" will extend to the end of
78+
-parent partiton and note that the size of partition in reg must be
79+
-set to 0 like reg = <0x0200000 0x0>.
80+
----
81+
-v1: Add mtd partition extend to end support.
82+
----
83+
-
84+
---- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
85+
-+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
86+
-@@ -34,8 +34,9 @@
87+
-
88+
- partition@200000 {
89+
- label = "ubi";
90+
-- reg = <0x200000 0x7e00000>;
91+
-+ reg = <0x200000 0x0>;
92+
- compatible = "linux,ubi";
93+
-+ mtd-extend-to-end;
94+
-
95+
- volumes {
96+
- nand_rootdisk: ubi-volume-fit {
97+
---- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
98+
-+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
99+
-@@ -54,8 +54,9 @@
100+
-
101+
- nor_rootdisk: partition@c00000 {
102+
- label = "fit";
103+
-- reg = <0xc00000 0x1400000>;
104+
-+ reg = <0xc00000 0x0>;
105+
- compatible = "denx,fit";
106+
-+ mtd-extend-to-end;
107+
- };
108+
- };
109+
- };
110+
diff --git a/target/linux/mediatek/patches-6.12/999-dts-mt7986a-rfb-13-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch b/target/linux/mediatek/patches-6.12/999-dts-mt7986a-rfb-13-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
111+
deleted file mode 100644
112+
index 27fb6e7421..0000000000
113+
--- a/target/linux/mediatek/patches-6.12/999-dts-mt7986a-rfb-13-arm64-dts-mediatek-add-last-partition-size-extend-to-end-support.patch
114+
+++ /dev/null
115+
@@ -1,72 +0,0 @@
116+
----
117+
-[v1] arm64: dts: mediatek: mt7986a: Add mtd partition extend to end support
118+
-Add "mtd-extend-to-end" in mt7986a spim nand/nor related dts.
119+
-Partition with "mtd-extend-to-end" will extend to the end of
120+
-parent partiton and note that the size of partition in reg must be
121+
-set to 0 like reg = <0x0200000 0x0>.
122+
----
123+
-v1: Add mtd partition extend to end support.
124+
----
125+
-
126+
---- a/arch/arm64/boot/dts/mediatek/mt7986-spim-nand-nmbm.dtso
127+
-+++ b/arch/arm64/boot/dts/mediatek/mt7986-spim-nand-nmbm.dtso
128+
-@@ -55,8 +55,9 @@
129+
-
130+
- partition@780000 {
131+
- label = "ubi";
132+
-- reg = <0x580000 0x4000000>;
133+
-+ reg = <0x580000 0x0>;
134+
- compatible = "linux,ubi";
135+
-+ mtd-extend-to-end;
136+
-
137+
- volumes {
138+
- ubi_rootfs: ubi-volume-fit {
139+
---- a/arch/arm64/boot/dts/mediatek/mt7986-spim-nor.dtso
140+
-+++ b/arch/arm64/boot/dts/mediatek/mt7986-spim-nor.dtso
141+
-@@ -39,7 +39,8 @@
142+
- };
143+
- nor_rootfs: partition@180000 {
144+
- label = "firmware";
145+
-- reg = <0x180000 0x1e80000>;
146+
-+ reg = <0x180000 0x0>;
147+
-+ mtd-extend-to-end;
148+
- };
149+
- };
150+
- };
151+
---- a/arch/arm64/boot/dts/mediatek/mt7986a-acelink-ew-7886cax.dts
152+
-+++ b/arch/arm64/boot/dts/mediatek/mt7986a-acelink-ew-7886cax.dts
153+
-@@ -147,8 +147,9 @@
154+
- };
155+
-
156+
- partition@580000 {
157+
-- reg = <0x580000 0x4000000>;
158+
-+ reg = <0x580000 0x0>;
159+
- label = "ubi";
160+
-+ mtd-extend-to-end;
161+
- };
162+
- };
163+
- };
164+
---- a/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
165+
-+++ b/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nand.dts
166+
-@@ -71,7 +71,8 @@
167+
- };
168+
- partition@580000 {
169+
- label = "ubi";
170+
-- reg = <0x580000 0x4000000>;
171+
-+ reg = <0x580000 0x0>;
172+
-+ mtd-extend-to-end;
173+
- };
174+
- };
175+
- };
176+
---- a/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
177+
-+++ b/arch/arm64/boot/dts/mediatek/mt7986a-rfb-spim-nor.dts
178+
-@@ -40,7 +40,8 @@
179+
- };
180+
- partition@180000 {
181+
- label = "firmware";
182+
-- reg = <0x180000 0xE00000>;
183+
-+ reg = <0x180000 0x0>;
184+
-+ mtd-extend-to-end;
185+
- };
186+
- };
187+
- };
188+
--
189+
2.45.2
190+

0 commit comments

Comments
 (0)