[openwrt/openwrt] ipq806x: tr4400v2: fix dtc warnings by deleting stock partitions

[LEDE Commits]

robimarko pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/5ad5677067cbad3c209c38e9fffdc5e839e87e6e

commit 5ad5677067cbad3c209c38e9fffdc5e839e87e6e
Author: Rodrigo Balerdi <lanchon at gmail.com>
AuthorDate: Thu Nov 14 17:37:32 2024 -0300

    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 <lanchon at gmail.com>
    Link: https://github.com/openwrt/openwrt/pull/16958
    Signed-off-by: Robert Marko <robimarko at gmail.com>
    (cherry picked from commit 8ec35a2a1533ccff8a4b0e6f4f0a0954d1bee6a6)
---
 .../arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts   | 30 +++-------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
index 8410721b72..5d86d80047 100644
--- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
+++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8065-tr4400-v2.dts
@@ -204,8 +204,8 @@
 					};
 				};
 			};
-			stock_partition at 1340000 {
-				label = "stock_rootfs";
+			partition at 1340000 {
+				label = "extra";
 				reg = <0x1340000 0x4000000>;
 			};
 			partition at 5340000 {
@@ -253,30 +253,10 @@
 				reg = <0x5f00000 0x0500000>;
 				read-only;
 			};
-			stock_partition at 6400000 {
-				label = "stock_rootfs_1";
-				reg = <0x6400000 0x4000000>;
-			};
-			stock_partition at a400000 {
-				label = "stock_fw_env";
-				reg = <0xa400000 0x0100000>;
-			};
-			stock_partition at a500000 {
-				label = "stock_config";
-				reg = <0xa500000 0x0800000>;
-			};
-			stock_partition at ad00000 {
-				label = "stock_PKI";
-				reg = <0xad00000 0x0200000>;
-			};
-			stock_partition at af00000 {
-				label = "stock_scfgmgr";
-				reg = <0xaf00000 0x0100000>;
-			};
-
 			partition at 6400000 {
 				label = "fw_env";
 				reg = <0x6400000 0x0100000>;
+				read-only;
 
 				nvmem-layout {
 					compatible = "fixed-layout";
@@ -304,10 +284,6 @@
 				label = "ubi";
 				reg = <0x6500000 0x9b00000>;
 			};
-			partition at 1340000 {
-				label = "extra";
-				reg = <0x1340000 0x4000000>;
-			};
 		};
 	};
 };