From 8084ec8061ef04df9a9231a660ada0a52f427b5f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Thu, 31 Mar 2022 17:50:31 +0200 Subject: [PATCH] ath79: cleanup mikrotik routerboot partitions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For some reason useless labels and aliases have been propagated through copy-paste. Before the issue spreads any further, this patch cleans up all relevant DTS files to the canonical form, bringing ath79 in line with other mikrotik platforms (ramips and ipq40xx). Signed-off-by: Thibaut VARÈNE --- target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi | 3 --- .../ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts | 2 +- .../linux/ath79/dts/ar9344_mikrotik_routerboard-16m-nor.dtsi | 3 +-- target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi | 2 +- target/linux/ath79/dts/qca9533_mikrotik_routerboard-16m.dtsi | 3 +-- .../ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts | 3 +-- target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi | 2 +- 7 files changed, 6 insertions(+), 12 deletions(-) diff --git a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi index c6cbe2fda1..6ec700f179 100644 --- a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi +++ b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi @@ -84,12 +84,10 @@ }; hard_config { - label = "hard_config"; read-only; }; bios { - label = "bios"; size = <0x1000>; read-only; }; @@ -100,7 +98,6 @@ }; soft_config { - label = "soft_config"; }; }; }; diff --git a/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts b/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts index b7ab1cacdb..82ab3ba91e 100644 --- a/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts +++ b/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts @@ -173,7 +173,7 @@ read-only; }; - hard_config: hard_config { + hard_config { read-only; }; diff --git a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-16m-nor.dtsi b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-16m-nor.dtsi index 4bf0731b1a..a1bb29b0f3 100644 --- a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-16m-nor.dtsi +++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-16m-nor.dtsi @@ -29,7 +29,7 @@ read-only; }; - hard_config: hard_config { + hard_config { read-only; }; @@ -45,7 +45,6 @@ }; soft_config { - label = "soft_config"; }; }; diff --git a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi index 86136289de..6cf84c98b3 100644 --- a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi +++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-sxt-5n.dtsi @@ -109,7 +109,7 @@ read-only; }; - hard_config: hard_config { + hard_config { read-only; }; diff --git a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-16m.dtsi b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-16m.dtsi index dbbe67d33d..e9bd05487c 100644 --- a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-16m.dtsi +++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-16m.dtsi @@ -48,7 +48,7 @@ read-only; }; - hard_config: hard_config { + hard_config { read-only; }; @@ -64,7 +64,6 @@ }; soft_config { - label = "soft_config"; }; }; diff --git a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts index f6e04ae0a4..485ef30e2c 100644 --- a/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts +++ b/target/linux/ath79/dts/qca9556_mikrotik_routerboard-wap-g-5hact2hnd.dts @@ -83,7 +83,7 @@ read-only; }; - hard_config: hard_config { + hard_config { read-only; }; @@ -99,7 +99,6 @@ }; soft_config { - label = "soft_config"; }; }; diff --git a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi index d71c12c1fd..7b7e3a65f8 100644 --- a/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi +++ b/target/linux/ath79/dts/qca9558_mikrotik_routerboard-92x.dtsi @@ -131,7 +131,7 @@ read-only; }; - hard_config: hard_config { + hard_config { read-only; }; -- 2.30.2