[openwrt/openwrt] mpc85xx: fix label-mac-address for Enterasys WS-AP3710i

[LEDE Commits]

blocktrron pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/e367ba9ec4cde1159120fd34d3dbbd99f38da72a

commit e367ba9ec4cde1159120fd34d3dbbd99f38da72a
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Sun Jun 16 01:33:19 2024 +0200

    mpc85xx: fix label-mac-address for Enterasys WS-AP3710i
    
    The WS-AP3710i does not correctly expose its label-mac on eth0 anymore
    since the change to simpleLoader.
    
    Fix this by obtaining the label-mac from the U-Boot environment.
    
    Signed-off-by: David Bauer <mail at david-bauer.net>
    (cherry picked from commit e321e70ddcd82e0b4a5ad695b83a88d44cde02b4)
---
 target/linux/mpc85xx/base-files/etc/board.d/02_network          | 4 ++++
 target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/target/linux/mpc85xx/base-files/etc/board.d/02_network b/target/linux/mpc85xx/base-files/etc/board.d/02_network
index caf00ef414..2574ebc9b9 100644
--- a/target/linux/mpc85xx/base-files/etc/board.d/02_network
+++ b/target/linux/mpc85xx/base-files/etc/board.d/02_network
@@ -16,6 +16,10 @@ aerohive,hiveap-330|\
 enterasys,ws-ap3715i)
 	ucidef_set_interfaces_lan_wan "eth1" "eth0"
 	;;
+enterasys,ws-ap3710i)
+	ucidef_set_interface_lan "eth0"
+	ucidef_set_label_macaddr "$(mtd_get_mac_ascii cfg1 ethaddr)"
+	;;
 hpe,msm460)
 	ucidef_set_interface_lan "eth0"
 	;;	
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts
index 2eb6f6e21e..4c223bb602 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts
@@ -15,7 +15,6 @@
 		led-failsafe = &led_power_red;
 		led-running = &led_power_green;
 		led-upgrade = &led_power_red;
-		label-mac-device = &enet0;
 	};
 
 	chosen {