From 76fff69180039ace23ce10a2570ec9f441a0cab6 Mon Sep 17 00:00:00 2001
From: Robert Marko <robert.marko@sartura.hr>
Date: Sun, 31 Oct 2021 14:33:15 +0100
Subject: [PATCH] ipq806x: ecw5410: use bootloader provided MAC-s

Currently, we are overriding the bootloader provided MAC-s as the ethernet
aliases are reversed so MAC-s were fixed up in userspace.
There is no need to do that as we can just fix the aliases instead and get
rid of MAC setting via userspace helper.

Fixes: 59f0a0f ("ipq806x: add Edgecore ECW5410 support")

Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---
 target/linux/ipq806x/base-files/etc/board.d/02_network        | 2 --
 .../ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts  | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
index a75d32ab6f..65a0e98b3b 100644
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -29,8 +29,6 @@ tplink,vr2600v)
 	;;
 edgecore,ecw5410)
 	ucidef_set_interfaces_lan_wan "eth1" "eth0"
-	ucidef_set_interface_macaddr "lan" "$(mtd_get_mac_binary "0:art" 0x6)"
-	ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary "0:art" 0x0)"
 	;;
 linksys,ea7500-v1)
 	hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
index 57724c19d7..377bb09616 100644
--- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
+++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
@@ -34,8 +34,8 @@
 
 	aliases {
 		serial1 = &gsbi1_serial;
-		ethernet0 = &gmac3;
-		ethernet1 = &gmac2;
+		ethernet0 = &gmac2;
+		ethernet1 = &gmac3;
 
 		led-boot = &led_power_green;
 		led-failsafe = &led_power_red;
-- 
2.30.2