From 21869e8f80c0af3977bb5bffece6986a556cb389 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Sat, 21 Mar 2020 22:54:53 +0100 Subject: [PATCH] ramips: mikrotik: use routerbootpart partitions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Enable routerbootpart partitions on MikroTik devices. Tested-by: Tobias Schramm Signed-off-by: Thibaut VARÈNE --- .../dts/mt7621_mikrotik_routerboard-750gr3.dts | 12 ++++-------- .../ramips/dts/mt7621_mikrotik_routerboard-m11g.dts | 12 ++++-------- .../ramips/dts/mt7621_mikrotik_routerboard-m33g.dts | 12 ++++-------- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts index af0664a4fa..a075d08556 100644 --- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts +++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts @@ -87,19 +87,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; }; @@ -109,9 +107,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 { -- 2.25.1