From f72d2ba60a5238d52ceaccd8e3e4b193a4534229 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 11 Jul 2019 23:39:10 +0200 Subject: [PATCH] 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 --- .../linux/ramips/base-files/etc/board.d/02_network | 12 +++++------- .../linux/ramips/dts/mt7620a_iodata_wn-ac1167gr.dts | 8 ++++---- .../linux/ramips/dts/mt7620a_iodata_wn-ac733gr3.dts | 8 ++++---- .../linux/ramips/dts/mt7621_iodata_wn-ax1167gr.dts | 6 +++--- target/linux/ramips/dts/mt7621_iodata_wn-gx300gr.dts | 8 ++++---- target/linux/ramips/dts/mt7621_mtc_wr1201.dts | 2 +- target/linux/ramips/dts/mt7621_xiaomi_mir3g.dts | 2 +- target/linux/ramips/dts/mt7621_xiaomi_mir3p.dts | 2 +- .../linux/ramips/dts/rt5350_intenso_memory2move.dts | 2 +- 9 files changed, 24 insertions(+), 26 deletions(-) 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 90e4e2923044..df1e4ce2227d 100755 --- 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 05acdf5750b2..3e61f5159810 100644 --- 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 @@ ðernet { 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 6b10238af901..ad96d94849eb 100644 --- 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 @@ ðernet { 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 e5c00abb0bef..2449112baf1b 100644 --- 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 999cb06fe7e6..020f78aba67a 100644 --- 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 @@ }; ðernet { - 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 7c2db6d30899..6f46818800b8 100644 --- 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 59b4e51313d9..fe1ab3122d4d 100644 --- 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 09a6881581e0..9800517597b1 100644 --- 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 122c70e21f3b..def61cabf389 100644 --- 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; }; -- 2.30.2