From b77e92e020c17b5530ec5c1b37cf66ae0cf717e6 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Sat, 26 Jul 2014 20:36:09 +0000
Subject: [PATCH] ramips: ethernet mac cleanup

Compile tested all subtargets and profiles.
Unfortunately I don't own any board affected by these changes, so no run tests.

Signed-off-by: Roman Yeryomin <roman@advem.lv>

SVN-Revision: 41839
---
 .../base-files/etc/uci-defaults/02_network    |  36 +++---
 .../base-files/lib/preinit/06_set_iface_mac   | 109 ------------------
 target/linux/ramips/dts/3G-6200NL.dts         |   4 +
 target/linux/ramips/dts/ALL5003.dts           |   4 +
 target/linux/ramips/dts/AWM002-EVB-4M.dts     |   4 +
 target/linux/ramips/dts/AWM002-EVB-8M.dts     |   4 +
 target/linux/ramips/dts/BR-6475ND.dts         |   3 +-
 target/linux/ramips/dts/DAP-1350.dts          |   4 +
 target/linux/ramips/dts/DIR-300-B1.dts        |   2 +-
 target/linux/ramips/dts/DIR-600-B1.dts        |   2 +-
 target/linux/ramips/dts/DIR-610-A1.dts        |   2 +-
 target/linux/ramips/dts/ESR-9753.dts          |   2 +-
 target/linux/ramips/dts/FREESTATION5.dts      |   2 +-
 target/linux/ramips/dts/HW550-3G.dts          |   4 +
 target/linux/ramips/dts/IP2202.dts            |   2 +-
 target/linux/ramips/dts/NBG-419N.dts          |   2 +-
 target/linux/ramips/dts/OMNI-EMB.dts          |   4 +
 target/linux/ramips/dts/PX4885.dts            |   2 +-
 target/linux/ramips/dts/RT-N10-PLUS.dts       |   4 +
 target/linux/ramips/dts/W306R_V20.dts         |   2 +-
 target/linux/ramips/dts/WL341V3.dts           |   4 +
 target/linux/ramips/dts/WL_330N.dts           |   4 +
 target/linux/ramips/dts/WL_330N3G.dts         |   4 +
 target/linux/ramips/dts/WR6202.dts            |   4 +
 target/linux/ramips/dts/XDXRN502J.dts         |   4 +
 25 files changed, 85 insertions(+), 133 deletions(-)
 delete mode 100644 target/linux/ramips/base-files/lib/preinit/06_set_iface_mac

diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network
index 85337c238b..f65388f613 100755
--- a/target/linux/ramips/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network
@@ -199,19 +199,22 @@ ramips_setup_macs()
 
 	case $board in
 	br-6475nd)
-		lan_mac=$(mtd_get_mac_binary devdata 13)
+		lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(mtd_get_mac_binary devdata 7)
 		;;
 
 	w306r-v20)
+		lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(macaddr_add "$lan_mac" 5)
 		;;
 
 	tew-691gr)
+		lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(macaddr_add "$lan_mac" 3)
 		;;
 
 	tew-692gr)
+		lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(macaddr_add "$lan_mac" 4)
 		;;
 
@@ -219,10 +222,24 @@ ramips_setup_macs()
 	m4 |\
 	x5 |\
 	x8)
-		lan_mac=$(macaddr_add "$lan_mac" -1)
+		lan_mac=$(cat /sys/class/net/eth0/address)
+		lan_mac=$(macaddr_add "$lan_mac" -2)
 		;;
 
-	dir-620-a1)
+	bc2 |\
+	broadway |\
+	d105 |\
+	dir-620-a1 |\
+	esr-9753 |\
+	freestation5 |\
+	hlk-rm04 | \
+	mpr-a1 | \
+	mpr-a2 | \
+	dir-300-b7 | \
+	dir-320-b1 | \
+	psr-680w |\
+	sl-r7205)
+		lan_mac=$(cat /sys/class/net/eth0/address)
 		lan_mac=$(macaddr_setbit_la "$lan_mac")
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
@@ -233,12 +250,13 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_ascii nvram wanmac)
 		;;
 
-	nbg-419n | \
 	wcr-150gn)
                 wan_mac=$(mtd_get_mac_binary factory 40)
 		;;
 
 	rt-n56u)
+		lan_mac=$(cat /sys/class/net/eth0/address)
+		lan_mac=$(macaddr_setbit_la "$lan_mac")
 		wan_mac=$(mtd_get_mac_binary factory 32772)
 		;;
 
@@ -250,16 +268,6 @@ ramips_setup_macs()
 		wan_mac=$(mtd_get_mac_binary factory 46)
 		;;
 
-	wl341v3)
-		lan_mac=$(mtd_get_mac_binary board-nvram 65440)
-		wan_mac=$(macaddr_add "$lan_mac" 1)
-		;;
-
-	wr8305rt)
-		lan_mac=$(mtd_get_mac_binary factory 4)
-		wan_mac=$(macaddr_add "$lan_mac" 1)
-		;;
-
 	*)
 		lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(macaddr_add "$lan_mac" 1)
diff --git a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac b/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
deleted file mode 100644
index 2a0a4fdc76..0000000000
--- a/target/linux/ramips/base-files/lib/preinit/06_set_iface_mac
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (C) 2011 OpenWrt.org
-#
-
-preinit_set_mac_address() {
-	local mac
-
-	. /lib/functions.sh
-	. /lib/ramips.sh
-
-	case $(ramips_board_name) in
-	3g-6200n |\
-	3g-6200nl |\
-	3g300m | \
-	dir-620-d1 |\
-	dir-300-b7 | \
-	w150m | \
-	mzk-w300nh2 |\
-	wl-330n |\
-	wl-330n3g |\
-	wr8305rt)
-		mac=$(mtd_get_mac_binary factory 4)
-		ifconfig eth0 hw ether $mac 2>/dev/null
-		;;
-	bc2 |\
-	broadway |\
-	d105 |\
-	dir-620-a1 |\
-	esr-9753 |\
-	freestation5 |\
-	hlk-rm04 | \
-	mpr-a1 | \
-	mpr-a2 | \
-	dir-300-b7 | \
-	dir-320-b1 | \
-	psr-680w |\
-	rt-n56u |\
-	sl-r7205)
-		mac=$(mtd_get_mac_binary factory 4)
-		mac=$(macaddr_setbit_la "$mac")
-		ifconfig eth0 hw ether $mac 2>/dev/null
-		;;
-	br-6475nd)
-		mac=$(mtd_get_mac_binary devdata 13)
-		ifconfig eth0 hw ether $mac 2>/dev/null
-		;;
-	asl26555 |\
-	dir-300-b1 |\
-	dir-300-b2 |\
-	dir-600-b1 |\
-	dir-610-a1)
-                mac=$(mtd_get_mac_binary devdata 16388)
-                ifconfig eth0 hw ether $mac 2>/dev/null
-                ;;
-	cy-swr1100 |\
-	dir-645)
-		mac=$(mtd_get_mac_ascii nvram lanmac)
-		mac=$(macaddr_setbit_la "$mac")
-		ifconfig eth0 hw ether $mac 2>/dev/null
-		;;
-	dap-1350)
-		mac=$(mtd_get_mac_binary devdata 46)
-		ifconfig eth0 hw ether $mac 2>/dev/null
-                ;;
-	all0239-3g |\
-	all0256n |\
-	all5002 |\
-	all5003 |\
-	awm002-evb |\
-	carambola |\
-	dir-615-h1 |\
-	fonera20n |\
-	ip2202 |\
-	rt-n13u |\
-	hw550-3g |\
-	nbg-419n |\
-	omni-emb |\
-	omni-emb-hpm |\
-	px4885 |\
-	tew-691gr |\
-	tew-692gr |\
-	w306r-v20 |\
-	w502u    |\
-	wr6202 |\
-	wnce2001 |\
-	xdxrn502j)
-		mac=$(mtd_get_mac_binary factory 40)
-		ifconfig eth0 hw ether $mac 2>/dev/null
-		;;
-	m3 |\
-	m4 |\
-	x5 |\
-	x8)
-		mac=$(mtd_get_mac_binary factory 4)
-		mac=$(macaddr_add "$mac" -1)
-		ifconfig eth0 hw ether $mac 2>/dev/null
-		;;
-	wl341v3)
-		mac=$(mtd_get_mac_binary board-nvram 65440)
-		ifconfig eth0 hw ether $mac 2>/dev/null
-		;;
-	rt-n10-plus)
-		mac=$(mtd_get_mac_binary devconf 4)
-		ifconfig eth0 hw ether $mac 2>/dev/null
-		;;
-	esac
-}
-
-boot_hook_add preinit_main preinit_set_mac_address
diff --git a/target/linux/ramips/dts/3G-6200NL.dts b/target/linux/ramips/dts/3G-6200NL.dts
index 6a2f46f2b3..2dec318c99 100644
--- a/target/linux/ramips/dts/3G-6200NL.dts
+++ b/target/linux/ramips/dts/3G-6200NL.dts
@@ -54,6 +54,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};
diff --git a/target/linux/ramips/dts/ALL5003.dts b/target/linux/ramips/dts/ALL5003.dts
index 0d21508fba..1d58b6a555 100644
--- a/target/linux/ramips/dts/ALL5003.dts
+++ b/target/linux/ramips/dts/ALL5003.dts
@@ -56,6 +56,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3f>;
 	};
diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/AWM002-EVB-4M.dts
index 12887d8481..c483d2d290 100644
--- a/target/linux/ramips/dts/AWM002-EVB-4M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-4M.dts
@@ -5,6 +5,10 @@
 / {
 	model = "AsiaRF AWM002 EVB";
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	wmac@10180000 {
 		ralink,mtd-eeprom = <&factory 0>;
 	};
diff --git a/target/linux/ramips/dts/AWM002-EVB-8M.dts b/target/linux/ramips/dts/AWM002-EVB-8M.dts
index 3be34bffa5..01e1e26fd3 100644
--- a/target/linux/ramips/dts/AWM002-EVB-8M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-8M.dts
@@ -5,6 +5,10 @@
 / {
 	model = "AsiaRF AWM002 EVB";
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	wmac@10180000 {
 		ralink,mtd-eeprom = <&factory 0>;
 	};
diff --git a/target/linux/ramips/dts/BR-6475ND.dts b/target/linux/ramips/dts/BR-6475ND.dts
index 60b8525609..06f00d6d63 100644
--- a/target/linux/ramips/dts/BR-6475ND.dts
+++ b/target/linux/ramips/dts/BR-6475ND.dts
@@ -31,6 +31,7 @@
 
 	ethernet@10100000 {
 		status = "okay";
+		mtd-mac-address = <&devdata 0x0d>;
 
 		port@0 {
 			ralink,fixed-link = <1000 1 1 1>;
@@ -99,7 +100,7 @@
 			read-only;
 		};
 
-		partition@50000 {
+		devdata: partition@50000 {
 			reg = <0x00050000 0x00020000>;
 			label = "devdata";
 			read-only;
diff --git a/target/linux/ramips/dts/DAP-1350.dts b/target/linux/ramips/dts/DAP-1350.dts
index 0513f576af..ee53e5ef95 100644
--- a/target/linux/ramips/dts/DAP-1350.dts
+++ b/target/linux/ramips/dts/DAP-1350.dts
@@ -58,6 +58,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&devdata 0x2e>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};
diff --git a/target/linux/ramips/dts/DIR-300-B1.dts b/target/linux/ramips/dts/DIR-300-B1.dts
index 621bf088f1..4c5b80fb21 100644
--- a/target/linux/ramips/dts/DIR-300-B1.dts
+++ b/target/linux/ramips/dts/DIR-300-B1.dts
@@ -49,7 +49,7 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4004>;
+		mtd-mac-address = <&devdata 0x4004>;
 	};
 
 	esw@10110000 {
diff --git a/target/linux/ramips/dts/DIR-600-B1.dts b/target/linux/ramips/dts/DIR-600-B1.dts
index 17903793ee..120a7fcd6d 100644
--- a/target/linux/ramips/dts/DIR-600-B1.dts
+++ b/target/linux/ramips/dts/DIR-600-B1.dts
@@ -49,7 +49,7 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4004>;
+		mtd-mac-address = <&devdata 0x4004>;
 	};
 
 	esw@10110000 {
diff --git a/target/linux/ramips/dts/DIR-610-A1.dts b/target/linux/ramips/dts/DIR-610-A1.dts
index 9893e7aa00..e345250ed6 100644
--- a/target/linux/ramips/dts/DIR-610-A1.dts
+++ b/target/linux/ramips/dts/DIR-610-A1.dts
@@ -53,7 +53,7 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4004>;
+		mtd-mac-address = <&devdata 0x4004>;
 	};
 
 	esw@10110000 {
diff --git a/target/linux/ramips/dts/ESR-9753.dts b/target/linux/ramips/dts/ESR-9753.dts
index 39e4232d4c..444ce93ceb 100644
--- a/target/linux/ramips/dts/ESR-9753.dts
+++ b/target/linux/ramips/dts/ESR-9753.dts
@@ -78,7 +78,7 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4004>;
+		mtd-mac-address = <&factory 0x4>;
 	};
 
 	esw@10110000 {
diff --git a/target/linux/ramips/dts/FREESTATION5.dts b/target/linux/ramips/dts/FREESTATION5.dts
index b221ae401b..e2c8d724f2 100644
--- a/target/linux/ramips/dts/FREESTATION5.dts
+++ b/target/linux/ramips/dts/FREESTATION5.dts
@@ -53,7 +53,7 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x28>;
+		mtd-mac-address = <&factory 0x4>;
 	};
 
 	esw@10110000 {
diff --git a/target/linux/ramips/dts/HW550-3G.dts b/target/linux/ramips/dts/HW550-3G.dts
index 3be3fce7b4..9cd09c4901 100644
--- a/target/linux/ramips/dts/HW550-3G.dts
+++ b/target/linux/ramips/dts/HW550-3G.dts
@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};
diff --git a/target/linux/ramips/dts/IP2202.dts b/target/linux/ramips/dts/IP2202.dts
index dc2af40364..47cbb975ee 100644
--- a/target/linux/ramips/dts/IP2202.dts
+++ b/target/linux/ramips/dts/IP2202.dts
@@ -49,7 +49,7 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4>;
+		mtd-mac-address = <&factory 0x28>;
 	};
 
 	esw@10110000 {
diff --git a/target/linux/ramips/dts/NBG-419N.dts b/target/linux/ramips/dts/NBG-419N.dts
index 6ef27d006e..1a826bdf4f 100644
--- a/target/linux/ramips/dts/NBG-419N.dts
+++ b/target/linux/ramips/dts/NBG-419N.dts
@@ -49,7 +49,7 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4>;
+		mtd-mac-address = <&factory 0x28>;
 	};
 
 	esw@10110000 {
diff --git a/target/linux/ramips/dts/OMNI-EMB.dts b/target/linux/ramips/dts/OMNI-EMB.dts
index c8bff4dd7d..d7c5c8aced 100644
--- a/target/linux/ramips/dts/OMNI-EMB.dts
+++ b/target/linux/ramips/dts/OMNI-EMB.dts
@@ -72,6 +72,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x2f>;
 	};
diff --git a/target/linux/ramips/dts/PX4885.dts b/target/linux/ramips/dts/PX4885.dts
index 0dcafc4b46..2bea444f82 100644
--- a/target/linux/ramips/dts/PX4885.dts
+++ b/target/linux/ramips/dts/PX4885.dts
@@ -53,7 +53,7 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x2e>;
+		mtd-mac-address = <&factory 0x28>;
 	};
 
 	esw@10110000 {
diff --git a/target/linux/ramips/dts/RT-N10-PLUS.dts b/target/linux/ramips/dts/RT-N10-PLUS.dts
index b51030c712..a942af2622 100644
--- a/target/linux/ramips/dts/RT-N10-PLUS.dts
+++ b/target/linux/ramips/dts/RT-N10-PLUS.dts
@@ -39,6 +39,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&devconf 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};
diff --git a/target/linux/ramips/dts/W306R_V20.dts b/target/linux/ramips/dts/W306R_V20.dts
index 1c2cf6af88..fe505b4fc0 100644
--- a/target/linux/ramips/dts/W306R_V20.dts
+++ b/target/linux/ramips/dts/W306R_V20.dts
@@ -49,7 +49,7 @@
 	};
 
 	ethernet@10100000 {
-		mtd-mac-address = <&factory 0x4>;
+		mtd-mac-address = <&factory 0x28>;
 	};
 
 	esw@10110000 {
diff --git a/target/linux/ramips/dts/WL341V3.dts b/target/linux/ramips/dts/WL341V3.dts
index 1271cfadbc..64d032700c 100644
--- a/target/linux/ramips/dts/WL341V3.dts
+++ b/target/linux/ramips/dts/WL341V3.dts
@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&boardnvram 0xffa0>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};
diff --git a/target/linux/ramips/dts/WL_330N.dts b/target/linux/ramips/dts/WL_330N.dts
index 999a29d330..e25535f1e8 100644
--- a/target/linux/ramips/dts/WL_330N.dts
+++ b/target/linux/ramips/dts/WL_330N.dts
@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};
diff --git a/target/linux/ramips/dts/WL_330N3G.dts b/target/linux/ramips/dts/WL_330N3G.dts
index 3b29104af5..e1196c697d 100644
--- a/target/linux/ramips/dts/WL_330N3G.dts
+++ b/target/linux/ramips/dts/WL_330N3G.dts
@@ -52,6 +52,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x4>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};
diff --git a/target/linux/ramips/dts/WR6202.dts b/target/linux/ramips/dts/WR6202.dts
index a769a98abc..430205e51b 100644
--- a/target/linux/ramips/dts/WR6202.dts
+++ b/target/linux/ramips/dts/WR6202.dts
@@ -81,6 +81,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};
diff --git a/target/linux/ramips/dts/XDXRN502J.dts b/target/linux/ramips/dts/XDXRN502J.dts
index 000f9db405..d7ca6cdf18 100644
--- a/target/linux/ramips/dts/XDXRN502J.dts
+++ b/target/linux/ramips/dts/XDXRN502J.dts
@@ -48,6 +48,10 @@
 		};
 	};
 
+	ethernet@10100000 {
+		mtd-mac-address = <&factory 0x28>;
+	};
+
 	esw@10110000 {
 		ralink,portmap = <0x3e>;
 	};
-- 
2.30.2