Skip to contentSkip to conversation

ARM: dts: BCM5301X: Correct description of TP-Link partitions

PATCH Applied Rafał Miłecki 2 participants 2 messages Nov 8, 2022 – Nov 9, 2022 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: BCM5301X: Correct description of TP-Link partitions

From: Rafał Miłecki <[email protected]>

TP-Link routers have flash space partitioned according to the partitions table. It may look like fixed partitioning but those partitions can be actually reorganized. New can be added (or some removed), offsets and sizes may change.

Fix DT to use binding for the TP-Link SafeLoader partitioning method.

---
 .../boot/dts/bcm47081-tplink-archer-c5-v2.dts | 25 ++++---------------
 .../boot/dts/bcm4709-tplink-archer-c9-v1.dts  | 25 ++++---------------
 2 files changed, 10 insertions(+), 40 deletions(-)
arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts +5 -20
index 19a7971b5a00..db9a37d70ef3 100644
@@ -95,30 +95,15 @@ &spi_nor {
 	status = "okay";
 
 	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		boot@0 {
-			label = "boot";
-			reg = <0x000000 0x040000>;
-			read-only;
-		};
+		compatible = "tplink,safeloader-partitions";
+		partitions-table-offset = <0xe50000>;
 
-		os-image@100000 {
-			label = "os-image";
-			reg = <0x040000 0x200000>;
+		partition-os-image {
 			compatible = "brcm,trx";
 		};
 
-		rootfs@240000 {
-			label = "rootfs";
-			reg = <0x240000 0xc00000>;
-		};
-
-		nvram@ff0000 {
-			label = "nvram";
-			reg = <0xff0000 0x010000>;
+		partition-file-system {
+			linux,rootfs;
 		};
 	};
 };
arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts +5 -20
index 11d1068160da..2cfb105f631a 100644
@@ -104,30 +104,15 @@ &spi_nor {
 	status = "okay";
 
 	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		boot@0 {
-			label = "boot";
-			reg = <0x000000 0x040000>;
-			read-only;
-		};
+		compatible = "tplink,safeloader-partitions";
+		partitions-table-offset = <0xe50000>;
 
-		os-image@100000 {
-			label = "os-image";
-			reg = <0x040000 0x200000>;
+		partition-os-image {
 			compatible = "brcm,trx";
 		};
 
-		rootfs@240000 {
-			label = "rootfs";
-			reg = <0x240000 0xc00000>;
-		};
-
-		nvram@ff0000 {
-			label = "nvram";
-			reg = <0xff0000 0x010000>;
+		partition-file-system {
+			linux,rootfs;
 		};
 	};
 };
Signature · 1 line
2.34.1
#1 lore raw
Quoted 11 lines · Rafał Miłecki

From: Rafał Miłecki <[email protected]>

TP-Link routers have flash space partitioned according to the partitions table. It may look like fixed partitioning but those partitions can be actually reorganized. New can be added (or some removed), offsets and sizes may change.

Fix DT to use binding for the TP-Link SafeLoader partitioning method.

---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian