ath79: cleanup mikrotik routerboot partitions

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 <hacks@slashdirt.org>

diff --git a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
index c6cbe2fda137604d46b9f016ad6daae6047254e1..6ec700f179c1ccae59e056449a9b8a3ba7041d84 100644 (file)
--- 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 b7ab1cacdb5207bdcd2343ce8c4b49bfc592b4c0..82ab3ba91e5fc81f584bdfeca9a389d55249d891 100644 (file)
--- 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 4bf0731b1afea8bc72e178ee4b207de380a0df4e..a1bb29b0f31875685f28d6af39d65cb4055f1115 100644 (file)
--- 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 86136289de3c121cca5a28236c12d4f3c3b4e034..6cf84c98b3aca37ce366ba3be03e5d1569fc9427 100644 (file)
--- 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 dbbe67d33db7900fb3770a611c14dc5de96952f0..e9bd05487c63d2b8a31c6dc23d072c1d562bd2f5 100644 (file)
--- 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 f6e04ae0a4b5368dc06897e57a5f561aba7020fd..485ef30e2c114ffb5a2608320d2d9e38a19136b4 100644 (file)
--- 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 d71c12c1fd73562f3dd55a352cf8b231346e6638..7b7e3a65f87ab2886ac9a36b92931d78cdcc9573 100644 (file)
--- 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;
                        };