X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fmt7621%2Fbase-files%2Fetc%2Fboard.d%2F02_network;h=03cc921be36b68b1e9ef21bc5d2e9916541b1418;hb=221d8a1c6086ffd8bc53f81d5074a177d8dd8480;hp=ae03dc71b1d9b97aeb908260ef7764f62014482b;hpb=62b1559b569c47e3b5596b190f3e077f8e70d7f0;p=oweals%2Fopenwrt.git

diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index ae03dc71b1..03cc921be3 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -9,128 +9,49 @@ ramips_setup_interfaces()
 	local board="$1"
 
 	case $board in
-	adslr,g7|\
-	afoundry,ew1200|\
-	d-team,pbr-m1|\
-	firefly,firewrt|\
-	hiwifi,hc5962|\
-	mediatek,ap-mt7621a-v60|\
-	mediatek,mt7621-eval-board|\
-	mqmaker,witi|\
-	mtc,wr1201|\
-	phicomm,k2p|\
-	planex,vr500|\
-	samknows,whitebox-v8|\
-	storylink,sap-g3200u3|\
-	telco-electronics,x1|\
-	totolink,a7000r|\
-	unielec,u7621-06-16m|\
-	unielec,u7621-06-64m|\
-	xiaoyu,xy-c5|\
-	xzwifi,creativebox-v1|\
-	youku,yk-l2|\
-	zbtlink,zbt-we1326|\
-	zbtlink,zbt-we3526|\
-	zbtlink,zbt-wg2626|\
-	zbtlink,zbt-wg3526-16m|\
-	zbtlink,zbt-wg3526-32m)
-		ucidef_add_switch "switch0" \
-			"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0"
-		;;
 	asiarf,ap7621-001)
-		ucidef_add_switch "switch0" "0:lan" "4:wan" "6@eth0"
-		;;
-	asiarf,ap7621-nv1)
-		ucidef_add_switch "switch0" "0:wan" "2:lan" "3:lan" "6@eth0"
-		;;
-	asus,rt-ac57u|\
-	mikrotik,rb750gr3|\
-	mikrotik,rbm33g|\
-	ubiquiti,edgerouterx|\
-	ubiquiti,edgerouterx-sfp|\
-	youhua,wr1200js)
-		ucidef_add_switch "switch0" \
-			"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0"
-		;;
-	asus,rt-ac65p|\
-	asus,rt-ac85p|\
-	dlink,dir-860l-b1|\
-	elecom,wrc-1167ghbk2-s|\
-	elecom,wrc-1900gst|\
-	elecom,wrc-2533gst|\
-	iodata,wn-ax1167gr|\
-	iodata,wn-gx300gr|\
-	iodata,wnpr2600g)
-		ucidef_add_switch "switch0" \
-			"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
-		;;
-	buffalo,wsr-1166dhp|\
-	buffalo,wsr-600dhp)
-		ucidef_add_switch "switch0" \
-			"0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4:wan:5" "6@eth0"
-		;;
-	d-team,newifi-d2)
-		ucidef_add_switch "switch0" \
-			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0"
+		ucidef_set_interfaces_lan_wan "lan" "wan"
 		;;
-	edimax,rg21s)
-		ucidef_add_switch "switch0" \
-			"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "0:wan" "6@eth0"
+	asiarf,ap7621-nv1|\
+	lenovo,newifi-d1|\
+	mikrotik,routerboard-m33g|\
+	xiaomi,mir3g|\
+	xiaomi,mir3g-v2)
+		ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
 		;;
-	gehua,ghl-r-001)
-		ucidef_add_switch "switch0" \
-			"0:lan" "1:lan" "2:lan" "4:wan" "6@eth0"
+	gehua,ghl-r-001|\
+	hiwifi,hc5962|\
+	xiaomi,mir3p|\
+	xiaomi,redmi-router-ac2100)
+		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
 		;;
 	gnubee,gb-pc1|\
 	gnubee,gb-pc2)
-		ucidef_add_switch "switch0" \
-			"0:lan" "4:lan" "6@eth0"
+		ucidef_set_interface_lan "lan1 lan2"
 		;;
-	lenovo,newifi-d1)
-		ucidef_add_switch "switch0" \
-		"1:lan:2" "2:lan:1" "4:wan" "6@eth0"
-		;;
-	linksys,re6500)
-		ucidef_add_switch "switch0" \
-			"0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "6@eth0"
-		;;
-	mikrotik,rbm11g|\
-	thunder,timecloud)
-		ucidef_add_switch "switch0"
-		ucidef_add_switch_attr "switch0" "enable" "false"
-		ucidef_set_interface_lan "eth0"
+	linksys,re6500|\
+	netgear,wac104)
+		ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
 		;;
+	mikrotik,routerboard-m11g|\
 	netgear,ex6150|\
+	thunder,timecloud|\
 	tplink,re350-v1|\
-	tplink,re650-v1)
-		ucidef_add_switch "switch0" \
-			"0:lan" "6@eth0"
+	tplink,re650-v1|\
+	ubnt,unifi-nanohd)
+		ucidef_set_interface_lan "lan"
 		;;
-	netgear,r6220|\
-	netgear,r6260|\
-	netgear,r6350|\
-	netgear,r6850|\
-	netgear,wndr3700-v5|\
-	netis,wf-2881|\
-	wevo,11acnas|\
-	wevo,w2914ns-v2)
-		ucidef_add_switch "switch0" \
-			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0"
+	mikrotik,routerboard-750gr3)
+		ucidef_set_interfaces_lan_wan "lan2 lan3 lan4 lan5" "wan"
 		;;
-	xiaomi,mir3g)
-		ucidef_add_switch "switch0" \
-			"2:lan:2" "3:lan:1" "1:wan" "6t@eth0"
+	ubnt,edgerouter-x)
+		ucidef_set_interface_lan_wan "eth1 eth2 eth3 eth4" "eth0"
 		;;
-	xiaomi,mir3g-v2)
-		ucidef_add_switch "switch0" \
-			"2:lan:2" "3:lan:1" "4:wan" "6@eth0"
-		;;
-	xiaomi,mir3p)
-		ucidef_add_switch "switch0" \
-			"1:lan:3" "2:lan:2" "3:lan:1" "4:wan" "6@eth0"
+	ubnt,edgerouter-x-sfp)
+		ucidef_set_interface_lan_wan "eth1 eth2 eth3 eth4 eth5" "eth0"
 		;;
 	*)
-		ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
+		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
 		;;
 	esac
 }
@@ -143,52 +64,10 @@ ramips_setup_macs()
 	local label_mac=""
 
 	case $board in
-	adslr,g7|\
-	afoundry,ew1200|\
-	asiarf,ap7621-001|\
-	asiarf,ap7621-nv1|\
-	firefly,firewrt|\
-	gehua,ghl-r-001|\
-	mediatek,ap-mt7621a-v60|\
-	mediatek,mt7621-eval-board|\
-	mikrotik,rb750gr3|\
-	mikrotik,rbm33g|\
-	mqmaker,witi|\
-	mtc,wr1201|\
-	netgear,r6220|\
-	netgear,wndr3700-v5|\
-	storylink,sap-g3200u3|\
-	telco-electronics,x1|\
-	totolink,a7000r|\
-	ubiquiti,edgerouterx|\
-	ubiquiti,edgerouterx-sfp|\
-	unielec,u7621-06-16m|\
-	unielec,u7621-06-64m|\
-	xiaoyu,xy-c5|\
-	xzwifi,creativebox-v1|\
-	zbtlink,zbt-wg2626)
-		wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 1)
-		;;
-	asus,rt-ac57u|\
-	d-team,newifi-d2|\
-	d-team,pbr-m1|\
-	elecom,wrc-1167ghbk2-s|\
-	elecom,wrc-1900gst|\
-	elecom,wrc-2533gst|\
-	lenovo,newifi-d1|\
-	netis,wf-2881|\
-	phicomm,k2p|\
-	planex,vr500|\
-	samknows,whitebox-v8|\
-	youhua,wr1200js|\
-	youku,yk-l2|\
-	zbtlink,zbt-we3526)
-		wan_mac=$(mtd_get_mac_binary factory 0xe006)
-		;;
 	asus,rt-ac65p|\
 	asus,rt-ac85p)
 		wan_mac=$(mtd_get_mac_ascii u-boot-env et1macaddr)
-		label_mac=$(cat /sys/class/ieee80211/phy0/macaddress)
+		label_mac=$(mtd_get_mac_binary factory 0x4)
 		;;
 	buffalo,wsr-1166dhp)
 		local index="$(find_mtd_index "board_data")"
@@ -198,8 +77,8 @@ ramips_setup_macs()
 	dlink,dir-860l-b1)
 		lan_mac=$(mtd_get_mac_ascii factory lanmac)
 		wan_mac=$(mtd_get_mac_ascii factory wanmac)
-		label_mac=$(cat /sys/class/ieee80211/phy1/macaddress)
 		;;
+	edimax,ra21s|\
 	edimax,rg21s)
 		lan_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
 		wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr)
@@ -210,43 +89,26 @@ ramips_setup_macs()
 		[ -n "$lan_mac" ] || lan_mac=$(cat /sys/class/net/eth0/address)
 		wan_mac=$(macaddr_add "$lan_mac" 1)
 		;;
-	iodata,wn-ax1167gr|\
-	iodata,wn-gx300gr)
-		wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x4)" 1)
-		;;
 	iodata,wnpr2600g)
 		wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr)
 		label_mac=$wan_mac
 		;;
-	netgear,r6260|\
-	netgear,r6350|\
-	netgear,r6850)
-		wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 2)
-		;;
-	wevo,11acnas|\
-	wevo,w2914ns-v2)
-		wan_mac=$(mtd_get_mac_binary factory 0x2e)
-		label_mac=$wan_mac
-		;;
-	xiaomi,mir3g)
-		lan_mac=$(mtd_get_mac_binary factory 0xe006)
-		;;
-	xiaomi,mir3g-v2)
-		wan_mac=$(mtd_get_mac_binary factory 0xe006)
-		label_mac=$wan_mac
-		;;
-	xiaomi,mir3p)
-		lan_mac=$(mtd_get_mac_binary factory 0xe006)
+	linksys,ea7500-v2)
+		lan_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
+		wan_mac=$lan_mac
 		label_mac=$lan_mac
 		;;
-	zbtlink,zbt-we1326)
-		wan_mac=$(mtd_get_mac_binary factory 0xe006)
-		label_mac=$(cat /sys/class/ieee80211/phy0/macaddress)
+	mikrotik,routerboard-750gr3|\
+	mikrotik,routerboard-m11g|\
+	mikrotik,routerboard-m33g)
+		label_mac=$(cat "/sys/firmware/mikrotik/hard_config/mac_base")
+		wan_mac=$label_mac
+		lan_mac=$(macaddr_add $label_mac 1)
 		;;
+	zbtlink,zbt-we1326|\
 	zbtlink,zbt-wg3526-16m|\
 	zbtlink,zbt-wg3526-32m)
-		wan_mac=$(macaddr_add "$(cat /sys/class/net/eth0/address)" 1)
-		label_mac=$(cat /sys/class/ieee80211/phy0/macaddress)
+		label_mac=$(mtd_get_mac_binary factory 0x4)
 		;;
 	esac