Skip to content

Commit 8ec35a2

Browse files
Lanchonrobimarko
authored andcommitted
ipq806x: tr4400v2: fix dtc warnings by deleting stock partitions
The original set of stock partitions was kept in the TR4400 v2 port, with the same partition numbers but their names prefixed with 'stock_'. This allowed scripts (installation, back to stock, etc) to run on both stock and OpenWrt firmware. But this triggers warnings in the device tree compiler, as partitions of the old and new schemes overlap. This commit fixes the dtc warnings by deleting the stock partitions, also renumbering some of the remaining MTD partitions in the process. Additionally, the 'fw_env' partition is set to read-only. These changes can break existing scripts as well as user configurations that utilize the 'extra' partition. Users wanting to run old scripts can do so by reverting to the 23.05 series releases. Signed-off-by: Rodrigo Balerdi <[email protected]> Link: openwrt/openwrt#16958 Signed-off-by: Robert Marko <[email protected]>
1 parent dea8397 commit 8ec35a2

File tree

1 file changed

+3
-27
lines changed

1 file changed

+3
-27
lines changed

target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@
204204
};
205205
};
206206
};
207-
stock_partition@1340000 {
208-
label = "stock_rootfs";
207+
partition@1340000 {
208+
label = "extra";
209209
reg = <0x1340000 0x4000000>;
210210
};
211211
partition@5340000 {
@@ -253,30 +253,10 @@
253253
reg = <0x5f00000 0x0500000>;
254254
read-only;
255255
};
256-
stock_partition@6400000 {
257-
label = "stock_rootfs_1";
258-
reg = <0x6400000 0x4000000>;
259-
};
260-
stock_partition@a400000 {
261-
label = "stock_fw_env";
262-
reg = <0xa400000 0x0100000>;
263-
};
264-
stock_partition@a500000 {
265-
label = "stock_config";
266-
reg = <0xa500000 0x0800000>;
267-
};
268-
stock_partition@ad00000 {
269-
label = "stock_PKI";
270-
reg = <0xad00000 0x0200000>;
271-
};
272-
stock_partition@af00000 {
273-
label = "stock_scfgmgr";
274-
reg = <0xaf00000 0x0100000>;
275-
};
276-
277256
partition@6400000 {
278257
label = "fw_env";
279258
reg = <0x6400000 0x0100000>;
259+
read-only;
280260

281261
nvmem-layout {
282262
compatible = "fixed-layout";
@@ -304,10 +284,6 @@
304284
label = "ubi";
305285
reg = <0x6500000 0x9b00000>;
306286
};
307-
partition@1340000 {
308-
label = "extra";
309-
reg = <0x1340000 0x4000000>;
310-
};
311287
};
312288
};
313289
};

0 commit comments

Comments
 (0)