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>

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 b3bd0aeae2ece33e16796dc48200aa501bd2f967..1042defb3f988d1e1966ee420847e0fd00208175 100644 (file)
--- 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 {
 };
 
 &ethernet {

-       mtd-mac-address = <&factory 0x28>;
+       mtd-mac-address = <&factory 0x2e>;

 };
 
 &sdhci {
 };
 
 &sdhci {

diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
index 1757d067630404edf2a72626c85b835c0824ed3a..04187a83535c84991b16337c175546d36d0f03a4 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
@@ -151,7 +151,7 @@
 };
 
 &ethernet {
 };
 
 &ethernet {

-       mtd-mac-address = <&factory 0x28>;
+       mtd-mac-address = <&factory 0x2e>;

 };
 
 &sdhci {
 };
 
 &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 3920afde958b5405b7a509928827810064874d96..5a5ba587d54a4db9aa497993ad3f09ca261c1bb0 100755 (executable)
--- 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)
                ;;
        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)
                ;;
        mercury,mac1200r-v2)
                wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory_info 0xd)" 1)
                ;;