From 633ea0db0f70c226f272db4727a58f96d3135208 Mon Sep 17 00:00:00 2001 From: Tobias Welz Date: Tue, 4 Aug 2020 18:30:15 +0200 Subject: [PATCH] ramips: WizFi630S use macs from factory partion WIZnet WizFi630s has three mac addresses in the factory partition: 0x04 (also on the label), 0x28 for wan mac and 0x2e as lan mac. All three macadresses are sequential series of addresses. This is making use of them. While at it, also add the label MAC address to 02_network. MAC addresses as verified by OEM firmware: use interface source WLAN ra0 factory 0x04 (label) WAN eth0.2 factory 0x28 (label + 1) LAN eth0.1 factory 0x2e (label + 2) Signed-off-by: Tobias Welz [fix sorting in 02_network, commit message adjustments] Signed-off-by: Adrian Schmutzler --- target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts | 2 +- .../linux/ramips/mt76x8/base-files/etc/board.d/02_network | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts index 684a70cffe..3bb1e06eb1 100644 --- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts +++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts @@ -145,7 +145,7 @@ }; ðernet { - mtd-mac-address = <&factory 0x28>; + mtd-mac-address = <&factory 0x2e>; }; &esw { 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 83437ea364..3920afde95 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 @@ -199,8 +199,7 @@ ramips_setup_macs() ;; rakwireless,rak633|\ unielec,u7628-01-16m|\ - wavlink,wl-wn575a3|\ - wiznet,wizfi630s) + wavlink,wl-wn575a3) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x28)" 1) ;; tplink,archer-c20-v4|\ @@ -225,6 +224,10 @@ ramips_setup_macs() zbtlink,zbt-we1226) wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x2e)" 1) ;; + wiznet,wizfi630s) + label_mac=$(mtd_get_mac_binary factory 0x4) + wan_mac=$(mtd_get_mac_binary factory 0x28) + ;; xiaomi,mir4a-100m) wan_mac=$(mtd_get_mac_binary factory 0x4) ;;