From fd1bf51885a007dbec2b1451e619a7394597530e Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 1 Jul 2023 15:37:56 +0800 Subject: [PATCH] mediatek: fix wifi mac for livinet zr-3020 Signed-off-by: Tianling Shen --- README.md | 2 +- target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dtsi | 7 ------- .../base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 6051b49871..2d49e090b0 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ To build your own firmware you need a GNU/Linux, BSD or MacOSX system (case sens 6. Run `make` to build your firmware. This will download all sources, build the cross-compile toolchain and then cross-compile the GNU/Linux kernel & all chosen applications for your target system. ### Related Repositories - The main repository uses multiple sub-repositories to manage packages of different categories. All packages are installed via the ImmortalWrt package manager called opkg. If you're looking to develop the web interface or port packages to ImmortalWrt, please find the fitting repository below. + The main repository uses multiple sub-repositories to manage packages of different categories. All packages are installed via the OpenWrt package manager called opkg. If you're looking to develop the web interface or port packages to ImmortalWrt, please find the fitting repository below. - [LuCI Web Interface](https://github.com/immortalwrt/luci): Modern and modular interface to control the device via a web browser. - [ImmortalWrt Packages](https://github.com/immortalwrt/packages): Community repository of ported packages. - [OpenWrt Routing](https://github.com/openwrt/routing): Packages specifically focused on (mesh) routing. diff --git a/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dtsi b/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dtsi index 4a4bc820a6..0f094c3946 100644 --- a/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dtsi +++ b/target/linux/mediatek/dts/mt7981b-livinet-zr-3020.dtsi @@ -176,10 +176,6 @@ #address-cells = <1>; #size-cells = <1>; - macaddr_config_5068a: macaddr@5068a { - reg = <0x5068a 0x11>; - }; - macaddr_config_50707: macaddr@50707 { reg = <0x50707 0x11>; }; @@ -316,7 +312,4 @@ status = "okay"; mediatek,mtd-eeprom = <&factory 0x0>; - - nvmem-cells = <&macaddr_config_5068a>; - nvmem-cell-names = "mac-address-ascii"; }; diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac index 5c914e025d..fd4befb206 100644 --- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac +++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac @@ -38,8 +38,8 @@ case "$board" in ;; livinet,zr-3020|\ livinet,zr-3020-ubootmod) - addr=$(mtd_get_mac_ascii config2 wifi5gmac) - [ "$PHYNBR" = "1" ] && echo $macaddr > /sys${DEVPATH}/macaddress + [ "$PHYNBR" = "0" ] && mtd_get_mac_ascii config2 wifi2gmac > /sys${DEVPATH}/macaddress + [ "$PHYNBR" = "1" ] && mtd_get_mac_ascii config2 wifi5gmac > /sys${DEVPATH}/macaddress ;; mercusys,mr90x-v1) addr=$(get_mac_binary "/tmp/tp_data/default-mac" 0)