From 6c3d37c6c82acff0a55aaf71dd91bae1e23a1e04 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 28 Apr 2026 14:52:29 -0700 Subject: [PATCH] ath79: ws-ap3610: assign MAC address with nvmem Userspace handling is deprecated. As with all ws-ap devices, a redundant u-boot environment is used. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/23146 Signed-off-by: Jonas Jelonek --- target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts | 11 +++++++++++ .../generic/base-files/lib/preinit/10_fix_eth_mac.sh | 3 --- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts index 27ac6c977b1..1eb61a74d5e 100644 --- a/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts +++ b/target/linux/ath79/dts/ar7161_siemens_ws-ap3610.dts @@ -108,6 +108,9 @@ phy-mode = "rgmii-id"; phy-handle = <&phy0>; + + nvmem-cells = <&macaddr_cfg1_ethaddr>; + nvmem-cell-names = "mac-address"; }; &spi { @@ -145,6 +148,14 @@ label = "cfg1"; reg = <0xe80000 0x40000>; read-only; + + nvmem-layout { + compatible = "u-boot,env-redundant-bool"; + env-size = <0x10000>; + + macaddr_cfg1_ethaddr: ethaddr { + }; + }; }; partition@ec0000 { diff --git a/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh b/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh index 1126a1eefc0..e30a31a59ca 100644 --- a/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh +++ b/target/linux/ath79/generic/base-files/lib/preinit/10_fix_eth_mac.sh @@ -12,9 +12,6 @@ preinit_set_mac_address() { ip link set dev eth0 address $(mtd_get_mac_ascii bdcfg "lanmac") ip link set dev eth1 address $(mtd_get_mac_ascii bdcfg "wanmac") ;; - siemens,ws-ap3610) - ip link set dev eth0 address $(mtd_get_mac_ascii cfg1 ethaddr) - ;; moxa,awk-1137c) ip link set dev eth0 address $(mtd_get_mac_ascii u-boot-env mac_addr) ;; -- 2.47.3