diff mbox series

[OpenWrt-Devel,v2,6/6] ramips: mikrotik: use routerbootpart partitions

Message ID 20200420131336.18252-7-hacks@slashdirt.org
State Accepted
Delegated to: Koen Vandeputte
Headers show
Series [OpenWrt-Devel,v2,1/6] generic: routerbootpart MTD parser for RouterBoot | expand

Commit Message

Thibaut April 20, 2020, 1:13 p.m. UTC 
Enable routerbootpart partitions on MikroTik devices.

Tested-by: Tobias Schramm <t.schramm@manjaro.org>
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
---
 .../linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts  | 12 ++++--------
 target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts | 12 ++++--------
 target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts | 12 ++++--------
 3 files changed, 12 insertions(+), 24 deletions(-)
diff mbox series

Patch

diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
index 3f37155f24..d7f97ef1d6 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
@@ -86,19 +86,17 @@ 
 				label = "RouterBoot";
 				reg = <0x0 0x40000>;
 				read-only;
-				compatible = "fixed-partitions";
+				compatible = "mikrotik,routerboot-partitions";
 				#address-cells = <1>;
 				#size-cells = <1>;
 
 				partition@0 {
 					label = "bootloader1";
-					reg = <0x0 0xf000>;
+					reg = <0x0 0x0>;
 					read-only;
 				};
 
-				hard_config: partition@f000 {
-					label = "hard_config";
-					reg = <0xf000 0x1000>;
+				hard_config: hard_config {
 					read-only;
 				};
 
@@ -108,9 +106,7 @@ 
 					read-only;
 				};
 
-				partition@20000 {
-					label = "soft_config";
-					reg = <0x20000 0x1000>;
+				soft_config {
 				};
 
 				partition@30000 {
diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts
index bd58aea951..128b8a2816 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts
@@ -95,19 +95,17 @@ 
 				label = "RouterBoot";
 				reg = <0x0 0x40000>;
 				read-only;
-				compatible = "fixed-partitions";
+				compatible = "mikrotik,routerboot-partitions";
 				#address-cells = <1>;
 				#size-cells = <1>;
 
 				partition@0 {
 					label = "bootloader1";
-					reg = <0x0 0xf000>;
+					reg = <0x0 0x0>;
 					read-only;
 				};
 
-				hard_config: partition@f000 {
-					label = "hard_config";
-					reg = <0xf000 0x1000>;
+				hard_config: hard_config {
 					read-only;
 				};
 
@@ -117,9 +115,7 @@ 
 					read-only;
 				};
 
-				partition@20000 {
-					label = "soft_config";
-					reg = <0x20000 0x1000>;
+				soft_config {
 				};
 
 				partition@30000 {
diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
index 19e1a71e99..aff2d0e64f 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
@@ -104,19 +104,17 @@ 
 				label = "RouterBoot";
 				reg = <0x0 0x40000>;
 				read-only;
-				compatible = "fixed-partitions";
+				compatible = "mikrotik,routerboot-partitions";
 				#address-cells = <1>;
 				#size-cells = <1>;
 
 				partition@0 {
 					label = "bootloader1";
-					reg = <0x0 0xf000>;
+					reg = <0x0 0x0>;
 					read-only;
 				};
 
-				hard_config: partition@f000 {
-					label = "hard_config";
-					reg = <0xf000 0x1000>;
+				hard_config: hard_config {
 					read-only;
 				};
 
@@ -126,9 +124,7 @@ 
 					read-only;
 				};
 
-				partition@20000 {
-					label = "soft_config";
-					reg = <0x20000 0x1000>;
+				soft_config {
 				};
 
 				partition@30000 {