aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-08-06 13:26:19 +0200
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-08-06 13:33:26 +0200
commit77e850fe76e3585a0d5094dbb8ea11be7d150aa8 (patch)
treebfed3bb48254e57ab84cdf5d5e1cb952ea44d997
parent633ea0db0f70c226f272db4727a58f96d3135208 (diff)
downloadupstream-77e850fe76e3585a0d5094dbb8ea11be7d150aa8.tar.gz
upstream-77e850fe76e3585a0d5094dbb8ea11be7d150aa8.tar.bz2
upstream-77e850fe76e3585a0d5094dbb8ea11be7d150aa8.zip
ramips: tidy up MAC address setup for Linkit Smart and Omega2
Linkit Smart 7688 and Onion Omega 2(+) are one-port devices, and have their port set to LAN by default. Setting up a WAN MAC address for them doesn't make any sense, as no wan interface will be created in uci config. Despite, these devices also set lan_mac in 02_network, although mtd-mac-address sets a different address for the ethernet interface in DTS. Clean this up by moving the lan_mac value into DTS and dropping the entries in 02_network completely. That way, the effective address on the LAN interface should stay the same, but we get rid of the extra (re)assignments. As I don't have access to the devices, this does not tell anything about whether 0x2e is actually a good choice, it just preserves the existing assignment. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
-rw-r--r--target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts2
-rw-r--r--target/linux/ramips/dts/mt7628an_onion_omega2.dtsi2
-rwxr-xr-xtarget/linux/ramips/mt76x8/base-files/etc/board.d/02_network6
3 files changed, 2 insertions, 8 deletions
diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
index b3bd0aeae2..1042defb3f 100644
--- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
+++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
@@ -149,7 +149,7 @@
};
&ethernet {
- mtd-mac-address = <&factory 0x28>;
+ mtd-mac-address = <&factory 0x2e>;
};
&sdhci {
diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
index 1757d06763..04187a8353 100644
--- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
@@ -151,7 +151,7 @@
};
&ethernet {
- mtd-mac-address = <&factory 0x28>;
+ mtd-mac-address = <&factory 0x2e>;
};
&sdhci {
diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
index 3920afde95..5a5ba587d5 100755
--- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
@@ -188,12 +188,6 @@ ramips_setup_macs()
totolink,lr1200)
wan_mac=$(mtd_get_mac_binary factory 0x2e)
;;
- mediatek,linkit-smart-7688|\
- onion,omega2|\
- onion,omega2p)
- wan_mac=$(mtd_get_mac_binary factory 0x4)
- lan_mac=$(mtd_get_mac_binary factory 0x2e)
- ;;
mercury,mac1200r-v2)
wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory_info 0xd)" 1)
;;