ramips: fix Ethernet random MAC address for HILINK HLK-7628N

Set the ethernet address from flash.

MAC addresses as verified by OEM firmware:

  use   interface  source
  2g    wlan0      factory 0x04 (label)
  LAN   eth0.1     factory 0x28 (label+1)
  WAN   eth0.2     factory 0x2e (label+2)

Fixes: 671c9d16e382 ("ramips: add support for HILINK HLK-7628N")
Signed-off-by: Liu Yu <f78fk@live.com>
[drop old MAC address setup from 02_network, cut out state_default
changes, face-lift commit message, add Fixes:]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
(cherry picked from commit ae9c5cd37bf5c08452f314b54afa963a00bdde30)

diff --git a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
index 69987b3566e964e1f31736c81d7e8c7a2d1b4747..f5106a50800e8de96445e064111a314aaf24294a 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
+++ b/target/linux/ramips/dts/mt7628an_hilink_hlk-7628n.dts
@@ -80,6 +80,10 @@
        };
 };
 
        };
 };
 

+&ethernet {
+       mtd-mac-address = <&factory 0x28>;
+};
+

 &wmac {
        status = "okay";
 };
 &wmac {
        status = "okay";
 };

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 b741b4f9b4dc6efaf4df66ce8ed744c4f925800a..c55733ad53cd8f3e5842919b1fb144a3074acef6 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
@@ -168,6 +168,7 @@ ramips_setup_macs()
                lan_mac=$wan_mac
                ;;
        cudy,wr1000|\
                lan_mac=$wan_mac
                ;;
        cudy,wr1000|\

+       hilink,hlk-7628n|\

        hilink,hlk-7688a|\
        wavlink,wl-wn577a2)
                wan_mac=$(mtd_get_mac_binary factory 0x2e)
        hilink,hlk-7688a|\
        wavlink,wl-wn577a2)
                wan_mac=$(mtd_get_mac_binary factory 0x2e)


@@ -186,10 +187,6 @@ ramips_setup_macs()
                wan_mac=$(mtd_get_mac_binary factory 0x22)
                label_mac=$wan_mac
                ;;
                wan_mac=$(mtd_get_mac_binary factory 0x22)
                label_mac=$wan_mac
                ;;

-       hilink,hlk-7628n)
-               lan_mac=$(macaddr_setbit_la "$(cat /sys/class/net/eth0/address)")
-               wan_mac=$(macaddr_add "$lan_mac" 1)
-               ;;

        hiwifi,hc5661a|\
        hiwifi,hc5761a|\
        hiwifi,hc5861b)
        hiwifi,hc5661a|\
        hiwifi,hc5761a|\
        hiwifi,hc5861b)