Author: kaloz
Date: 2015-05-03 20:00:47 +0200 (Sun, 03 May 2015)
New Revision: 45599

Modified:
   trunk/target/linux/mpc85xx/base-files/etc/uci-defaults/02_network
   trunk/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
Log:
mpc85xx: replace WDR4900 uci-defaults ethernet MAC address hack with DTS entry

This also changes the MAC address to one of the adresses actually used by the
stock firmware on one of the ethernet interfaces.
 
Signed-off-by: Matthias Schiffer <[email protected]>



Modified: trunk/target/linux/mpc85xx/base-files/etc/uci-defaults/02_network
===================================================================
--- trunk/target/linux/mpc85xx/base-files/etc/uci-defaults/02_network   
2015-05-03 17:59:46 UTC (rev 45598)
+++ trunk/target/linux/mpc85xx/base-files/etc/uci-defaults/02_network   
2015-05-03 18:00:47 UTC (rev 45599)
@@ -20,8 +20,6 @@
        ucidef_add_switch "switch0" "1" "1"
        ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5"
        ucidef_add_switch_vlan "switch0" "2" "0t 1"
-       ucidef_set_interface_macaddr lan "$(mtd_get_mac_binary config 338)"
-       ucidef_set_interface_macaddr wan "$(mtd_get_mac_binary config 344)"
        ;;
 *)
        ucidef_set_interfaces_lan_wan "eth0" "eth1"

Modified: 
trunk/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
===================================================================
--- trunk/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts    
2015-05-03 17:59:46 UTC (rev 45598)
+++ trunk/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts    
2015-05-03 18:00:47 UTC (rev 45599)
@@ -63,7 +63,7 @@
                                        label = "rootfs";
                                };
 
-                               config@fe0000 {
+                               config: config@fe0000 {
                                        reg = <0x00fe0000 0x00010000>;
                                        label = "config";
                                        read-only;
@@ -118,6 +118,7 @@
                enet0: ethernet@b0000 {
                        phy-handle = <&phy0>;
                        phy-connection-type = "rgmii-id";
+                       mtd-mac-address = <&config 0x14c>;
                };
 
                enet1: ethernet@b1000 {
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to