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>
This commit is contained in:
Adrian Schmutzler 2019-07-11 23:39:10 +02:00 committed by Chuanhong Guo
parent ee5fce887a
commit f72d2ba60a
9 changed files with 24 additions and 26 deletions

View File

@ -609,11 +609,12 @@ ramips_setup_macs()
;; ;;
iodata,wn-ac1167gr|\ iodata,wn-ac1167gr|\
iodata,wn-ac733gr3) 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-ax1167gr|\
iodata,wn-gx300gr) iodata,wn-gx300gr|\
wan_mac=$(macaddr_add "$(mtd_get_mac_binary Factory 4)" 1) trendnet,tew-692gr)
wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 4)" 1)
;; ;;
lenovo,newifi-d1) lenovo,newifi-d1)
lan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 2) lan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)
@ -667,16 +668,13 @@ ramips_setup_macs()
trendnet,tew-691gr) trendnet,tew-691gr)
wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 4)" 3) 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) wiznet,wizfi630a)
lan_mac=$(mtd_get_mac_binary factory 4) lan_mac=$(mtd_get_mac_binary factory 4)
wan_mac=$(mtd_get_mac_binary factory 40) wan_mac=$(mtd_get_mac_binary factory 40)
;; ;;
xiaomi,mir3g|\ xiaomi,mir3g|\
xiaomi,mir3p) xiaomi,mir3p)
lan_mac=$(mtd_get_mac_binary Factory 0xe006) lan_mac=$(mtd_get_mac_binary factory 0xe006)
;; ;;
xiaomi,miwifi-mini) xiaomi,miwifi-mini)
wan_mac=$(cat /sys/class/net/eth0/address) wan_mac=$(cat /sys/class/net/eth0/address)

View File

@ -92,8 +92,8 @@
read-only; read-only;
}; };
Factory: partition@40000 { factory: partition@40000 {
label = "Factory"; label = "factory";
reg = <0x40000 0x8000>; reg = <0x40000 0x8000>;
read-only; read-only;
}; };
@ -140,7 +140,7 @@
&ethernet { &ethernet {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&rgmii1_pins &mdio_pins>; pinctrl-0 = <&rgmii1_pins &mdio_pins>;
mtd-mac-address = <&Factory 0x4>; mtd-mac-address = <&factory 0x4>;
port@5 { port@5 {
status = "okay"; status = "okay";
@ -207,5 +207,5 @@
}; };
&wmac { &wmac {
ralink,mtd-eeprom = <&Factory 0x0>; ralink,mtd-eeprom = <&factory 0x0>;
}; };

View File

@ -106,8 +106,8 @@
read-only; read-only;
}; };
Factory: partition@40000 { factory: partition@40000 {
label = "Factory"; label = "factory";
reg = <0x40000 0x8000>; reg = <0x40000 0x8000>;
read-only; read-only;
}; };
@ -148,7 +148,7 @@
&ethernet { &ethernet {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&rgmii1_pins>; pinctrl-0 = <&rgmii1_pins>;
mtd-mac-address = <&Factory 0x4>; mtd-mac-address = <&factory 0x4>;
port@5 { port@5 {
status = "okay"; status = "okay";
@ -189,5 +189,5 @@
}; };
&wmac { &wmac {
ralink,mtd-eeprom = <&Factory 0x0>; ralink,mtd-eeprom = <&factory 0x0>;
}; };

View File

@ -91,8 +91,8 @@
read-only; read-only;
}; };
Factory: partition@40000 { factory: partition@40000 {
label = "Factory"; label = "factory";
reg = <0x40000 0x10000>; reg = <0x40000 0x10000>;
read-only; read-only;
}; };
@ -157,7 +157,7 @@
&pcie1 { &pcie1 {
mt76@0,0 { mt76@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&Factory 0x0>; mediatek,mtd-eeprom = <&factory 0x0>;
ieee80211-freq-limit = <5000000 6000000>; ieee80211-freq-limit = <5000000 6000000>;
}; };
}; };

View File

@ -91,8 +91,8 @@
read-only; read-only;
}; };
Factory: partition@40000 { factory: partition@40000 {
label = "Factory"; label = "factory";
reg = <0x40000 0x10000>; reg = <0x40000 0x10000>;
read-only; read-only;
}; };
@ -131,7 +131,7 @@
}; };
&ethernet { &ethernet {
mtd-mac-address = <&Factory 0x4>; mtd-mac-address = <&factory 0x4>;
}; };
&pinctrl { &pinctrl {
@ -150,7 +150,7 @@
&pcie0 { &pcie0 {
mt76@0,0 { mt76@0,0 {
reg = <0x0000 0 0 0 0>; reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&Factory 0x0>; mediatek,mtd-eeprom = <&factory 0x0>;
}; };
}; };

View File

@ -84,7 +84,7 @@
}; };
factory: partition@40000 { factory: partition@40000 {
label = "Factory"; label = "factory";
reg = <0x40000 0x10000>; reg = <0x40000 0x10000>;
read-only; read-only;
}; };

View File

@ -105,7 +105,7 @@
}; };
factory: partition@100000 { factory: partition@100000 {
label = "Factory"; label = "factory";
reg = <0x100000 0x40000>; reg = <0x100000 0x40000>;
read-only; read-only;
}; };

View File

@ -111,7 +111,7 @@
}; };
factory: partition@c0000 { factory: partition@c0000 {
label = "Factory"; label = "factory";
reg = <0x0c0000 0x40000>; reg = <0x0c0000 0x40000>;
read-only; read-only;
}; };

View File

@ -78,7 +78,7 @@
}; };
factory: partition@40000 { factory: partition@40000 {
label = "Factory"; label = "factory";
reg = <0x40000 0x10000>; reg = <0x40000 0x10000>;
read-only; read-only;
}; };