[OpenWrt-Devel] [PATCH] mpc85xx: correct TP-LINK TL-WDR4900 MAC addresses

[David Bauer]

This commit fixes TP-Link TL-WDR4900 v1 MAC address assignment.
Previously, the MAC addrss was read for the ethernet from the "config"
partition. However, the content of this partition is dependent on the
firmware which was previously installed on the device.

Switch the MAC address source to the U-Boot partition, where the MAC
address is always present at a fixed partition. The partition was
previously already used for the WiFi MAC-addresses.

Signed-off-by: David Bauer <mail at david-bauer.net>
---
 target/linux/mpc85xx/base-files/etc/board.d/02_network      | 2 +-
 .../mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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 f907fd2edb..aa33a4af96 100755
--- a/target/linux/mpc85xx/base-files/etc/board.d/02_network
+++ b/target/linux/mpc85xx/base-files/etc/board.d/02_network
@@ -21,7 +21,7 @@ ocedo,panda)
 tplink,tl-wdr4900-v1)
 	ucidef_add_switch "switch0" \
 		"0 at eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
-	ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary config 0x14c)"
+	ucidef_set_interface_macaddr "wan" "$(macaddr_add $(mtd_get_mac_binary u-boot 0x4fc00) 1)"
 	;;
 *)
 	ucidef_set_interfaces_lan_wan "eth0" "eth1"
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
index 0e0d74c0d8..0998a4933a 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
@@ -49,7 +49,7 @@
 					#address-cells = <1>;
 					#size-cells = <1>;
 
-					partition at 0 {
+					uboot: partition at 0 {
 						reg = <0x0 0x0050000>;
 						label = "u-boot";
 						read-only;
@@ -67,7 +67,7 @@
 						label = "firmware";
 					};
 
-					config: partition at fe0000 {
+					partition at fe0000 {
 						reg = <0x00fe0000 0x00010000>;
 						label = "config";
 						read-only;
@@ -119,7 +119,7 @@
 		enet0: ethernet at b0000 {
 			phy-handle = <&phy0>;
 			phy-connection-type = "rgmii-id";
-			mtd-mac-address = <&config 0x144>;
+			mtd-mac-address = <&uboot 0x4fc00>;
 		};
 
 		enet1: ethernet at b1000 {
-- 
2.23.0


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel