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@david-bauer.net>
(cherry picked from commit e321e70ddcd82e0b4a5ad695b83a88d44cde02b4)

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 caf00ef414abfb0794c4ce48ea69d5285f72c90e..2574ebc9b9458de3c3e87bf956521f33cb4673a8 100644 (file)
--- 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 2eb6f6e21ec9bfd3473a202e73f5fbf28d5b9027..4c223bb60235ea1a82bff38815370860aa36ae9e 100644 (file)
--- 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 {