ramips: consistently use lower-case factory partition label

The vast majority of devices labels "factory" partition with lower
case. Convert the small fraction with capital letter to that and
merge another case in 02_network.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 90e4e292304416a3f98c45e917fc7ee059249ce4..df1e4ce2227d4b7028164cff5974d2095fd4c99f 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -609,11 +609,12 @@ ramips_setup_macs()
                ;;
        iodata,wn-ac1167gr|\
        iodata,wn-ac733gr3)
-               wan_mac=$(macaddr_add "$(mtd_get_mac_binary Factory 4)" -1)
+               wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 4)" -1)
                ;;
        iodata,wn-ax1167gr|\
-       iodata,wn-gx300gr)
-               wan_mac=$(macaddr_add "$(mtd_get_mac_binary Factory 4)" 1)
+       iodata,wn-gx300gr|\
+       trendnet,tew-692gr)
+               wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 4)" 1)
                ;;
        lenovo,newifi-d1)
                lan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)
@@ -667,16 +668,13 @@ ramips_setup_macs()
        trendnet,tew-691gr)
                wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 4)" 3)
                ;;
-       trendnet,tew-692gr)
-               wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 4)" 1)
-               ;;
        wiznet,wizfi630a)
                lan_mac=$(mtd_get_mac_binary factory 4)
                wan_mac=$(mtd_get_mac_binary factory 40)
                ;;
        xiaomi,mir3g|\
        xiaomi,mir3p)
-               lan_mac=$(mtd_get_mac_binary Factory 0xe006)
+               lan_mac=$(mtd_get_mac_binary factory 0xe006)
                ;;
        xiaomi,miwifi-mini)
                wan_mac=$(cat /sys/class/net/eth0/address)

diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts
index 05acdf5750b2b0117b6f5d218dcd636d3cc06aa5..3e61f515981057bf5c563363cba929161cfb5dd5 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts
+++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts
@@ -92,8 +92,8 @@
                                read-only;
                        };
 
-                       Factory: partition@40000 {
-                               label = "Factory";
+                       factory: partition@40000 {
+                               label = "factory";
                                reg = <0x40000 0x8000>;
                                read-only;
                        };
@@ -140,7 +140,7 @@
 &ethernet {
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii1_pins &mdio_pins>;
-       mtd-mac-address = <&Factory 0x4>;
+       mtd-mac-address = <&factory 0x4>;
 
        port@5 {
                status = "okay";
@@ -207,5 +207,5 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&Factory 0x0>;
+       ralink,mtd-eeprom = <&factory 0x0>;
 };

diff --git a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts
index 6b10238af90180913a9340c7b4cbc47e00876662..ad96d94849eb7dea44bdfe845e6bb86122f81e8b 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts
+++ b/target/linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts
@@ -106,8 +106,8 @@
                                read-only;
                        };
 
-                       Factory: partition@40000 {
-                               label = "Factory";
+                       factory: partition@40000 {
+                               label = "factory";
                                reg = <0x40000 0x8000>;
                                read-only;
                        };
@@ -148,7 +148,7 @@
 &ethernet {
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii1_pins>;
-       mtd-mac-address = <&Factory 0x4>;
+       mtd-mac-address = <&factory 0x4>;
 
        port@5 {
                status = "okay";
@@ -189,5 +189,5 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&Factory 0x0>;
+       ralink,mtd-eeprom = <&factory 0x0>;
 };

diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
index e5c00abb0bef318d7c5ce3e541abd1906ba557ba..2449112baf1bfb01df10e8af30dcee005d2d7a40 100644 (file)
--- a/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts
@@ -91,8 +91,8 @@
                                read-only;
                        };
 
-                       Factory: partition@40000 {
-                               label = "Factory";
+                       factory: partition@40000 {
+                               label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
                        };
@@ -157,7 +157,7 @@
 &pcie1 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&Factory 0x0>;
+               mediatek,mtd-eeprom = <&factory 0x0>;
                ieee80211-freq-limit = <5000000 6000000>;
        };
 };

diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
index 999cb06fe7e68729ac2d89563ab1af4f0c5d4a9b..020f78aba67ab5de8a910d28745606c3651755de 100644 (file)
--- a/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
+++ b/target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts
@@ -91,8 +91,8 @@
                                read-only;
                        };
 
-                       Factory: partition@40000 {
-                               label = "Factory";
+                       factory: partition@40000 {
+                               label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
                        };
@@ -131,7 +131,7 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&Factory 0x4>;
+       mtd-mac-address = <&factory 0x4>;
 };
 
 &pinctrl {
@@ -150,7 +150,7 @@
 &pcie0 {
        mt76@0,0 {
                reg = <0x0000 0 0 0 0>;
-               mediatek,mtd-eeprom = <&Factory 0x0>;
+               mediatek,mtd-eeprom = <&factory 0x0>;
        };
 };
 

diff --git a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
index 7c2db6d30899cdcf9747924272d9dacb3e589d08..6f46818800b837c497744d7f01d6cf1ea3106307 100644 (file)
--- a/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
+++ b/target/linux/ramips/dts/mt7621_mtc_wr1201.dts
@@ -84,7 +84,7 @@
                        };
 
                        factory: partition@40000 {
-                               label = "Factory";
+                               label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
                        };

diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts
index 59b4e51313d9f4ccd81ab97c8b5ca17689e8414a..fe1ab3122d4da952e37d75e54f8281552c9f87c5 100644 (file)
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts
@@ -105,7 +105,7 @@
                };
 
                factory: partition@100000 {
-                       label = "Factory";
+                       label = "factory";
                        reg = <0x100000 0x40000>;
                        read-only;
                };

diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts
index 09a6881581e06b6c60eb62622ce9399da241ca7e..9800517597b1990957a59ec5aa6eee0fbe085d09 100644 (file)
--- a/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts
@@ -111,7 +111,7 @@
                };
 
                factory: partition@c0000 {
-                       label = "Factory";
+                       label = "factory";
                        reg = <0x0c0000 0x40000>;
                        read-only;
                };

diff --git a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts
index 122c70e21f3b3198fddda5d2d575b1003afd8d1f..def61cabf38971ebd4b2857711221d8d613ab469 100644 (file)
--- a/target/linux/ramips/dts/rt5350_intenso_memory2move.dts
+++ b/target/linux/ramips/dts/rt5350_intenso_memory2move.dts
@@ -78,7 +78,7 @@
                        };
 
                        factory: partition@40000 {
-                               label = "Factory";
+                               label = "factory";
                                reg = <0x40000 0x10000>;
                                read-only;
                        };