X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fipq40xx%2Fbase-files%2Fetc%2Fboard.d%2F02_network;h=2e0e8d33cd625530c1f6c32f155cf49477f0a66f;hb=0f269554e4fd16dd4bcb705e38ff063199e57018;hp=d744e9b7e2b2dfdeecb72314abaa4d0c5ac6473f;hpb=e24635710c7e6444afa463c59f3d81fe634eb3c7;p=openwrt%2Fstaging%2Fdedeckeh.git

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index d744e9b7e2..2e0e8d33cd
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (c) 2015 The Linux Foundation. All rights reserved.
 # Copyright (c) 2011-2015 OpenWrt.org
@@ -13,100 +12,91 @@ ipq40xx_setup_interfaces()
 
 	case "$board" in
 	8dev,habanero-dvk|\
+	avm,fritzbox-4040|\
+	asus,rt-ac42u|\
+	asus,rt-ac58u|\
+	linksys,ea6350v3|\
+	linksys,ea8300|\
+	linksys,mr8300|\
+	mikrotik,hap-ac2|\
+	mikrotik,hap-ac3|\
+	mikrotik,hap-ac3-lte6-kit|\
+	p2w,r619ac-64m|\
+	p2w,r619ac-128m|\
+	pakedge,wr-1|\
+	zyxel,nbg6617)
+		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
+		;;
 	8dev,jalapeno|\
 	alfa-network,ap120c-ac|\
-	engenius,emr3500|\
-	engenius,ens620ext|\
-	luma,wrtq-329acn)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
+	asus,map-ac2200|\
+	cilab,meshpoint-one|\
+	edgecore,ecw5211|\
+	glinet,gl-ap1300|\
+	glinet,gl-b2200|\
+	google,wifi|\
+	linksys,whw03v2|\
+	luma,wrtq-329acn|\
+	mikrotik,cap-ac|\
+	netgear,wac510|\
+	sony,ncp-hg100-cellular|\
+	wallys,dr40x9|\
+	zte,mf18a|\
+	zte,mf289f)
+		ucidef_set_interfaces_lan_wan "lan" "wan"
 		;;
 	aruba,ap-303|\
 	aruba,ap-365|\
 	avm,fritzrepeater-1200|\
-	dlink,dap-2610 |\
-	engenius,eap1300|\
-	engenius,emd1|\
+	dlink,dap-2610|\
+	extreme-networks,ws-ap3915i|\
 	meraki,mr33|\
+	meraki,mr74|\
+	mikrotik,lhgg-60ad|\
+	mikrotik,sxtsq-5-ac|\
 	netgear,ex6100v2|\
-	netgear,ex6150v2|\
-	zyxel,wre6606)
-		ucidef_set_interface_lan "eth0"
-		;;
-	aruba,ap-303h)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "0u@eth1" "5:wan"
-		;;
-	asus,map-ac2200|\
-	cilab,meshpoint-one|\
-	edgecore,ecw5211|\
-	edgecore,oap100|\
-	openmesh,a42|\
-	openmesh,a62)
-		ucidef_set_interfaces_lan_wan "eth1" "eth0"
-		;;
-	asus,rt-ac58u|\
-	zyxel,nbg6617)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
-		;;
-	avm,fritzbox-4040|\
-	linksys,ea6350v3|\
-	linksys,ea8300)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
+	netgear,ex6150v2)
+		ucidef_set_interface_lan "lan"
 		;;
 	avm,fritzbox-7530)
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
+		ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
 		;;
-	avm,fritzrepeater-3000)
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "4:lan:1" "5:lan:2"
+	cellc,rtl30vw)
+		ucidef_set_interface_lan "lan1 lan2"
 		;;
-	compex,wpj419|\
-	compex,wpj428|\
-	engenius,eap2200)
-		ucidef_set_interface_lan "eth0 eth1"
+	compex,wpj428)
+		ucidef_set_interface_lan "lan1 lan2"
 		;;
-	buffalo,wtr-m2133hp)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "2:lan:3" "3:lan:2" "4:lan:1"
+	linksys,whw01)
+		ucidef_set_interface_lan "eth1 eth2"
 		;;
-	cellc,rtl30vw)
-		ucidef_set_interface_lan "eth0"
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "3:lan" "4:lan"
+	glinet,gl-a1300|\
+	glinet,gl-b1300|\
+	mobipromo,cm520-79f)
+		ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
 		;;
-	ezviz,cs-w3-wd1200g-eup)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "2:lan:3" "3:lan:2" "4:lan:1" "0u@eth1" "5:wan"
+	mikrotik,wap-ac|\
+	mikrotik,wap-ac-lte|\
+	mikrotik,wap-r-ac)
+		ucidef_set_interface_lan "sw-eth1 sw-eth2"
 		;;
-	glinet,gl-b1300 |\
-	glinet,gl-s1300)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "3:lan" "4:lan"
+	aruba,ap-303h|\
+	netgear,rbr50|\
+	netgear,rbs50|\
+	netgear,srr60|\
+	netgear,srs60)
+		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
 		;;
-	mobipromo,cm520-79f)
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "3:lan:2" "4:lan:1"
-		ucidef_set_interface_wan "eth1"
+	openmesh,a42|\
+	openmesh,a62)
+		ucidef_set_interfaces_lan_wan "ethernet2" "ethernet1"
 		;;
-	qxwlan,e2600ac-c1 |\
-	qxwlan,e2600ac-c2)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "3:lan" "4:lan" "0u@eth1" "5:wan"
+	plasmacloud,pa1200|\
+	plasmacloud,pa2200)
+		ucidef_set_interfaces_lan_wan "ethernet1" "ethernet2"
 		;;
-	unielec,u4019-32m)
-		ucidef_set_interfaces_lan_wan "eth0" "eth1"
-		ucidef_add_switch "switch0" \
-			"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "0u@eth1" "5:wan"
+	zte,mf286d)
+		ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" "wan"
 		;;
 	*)
 		echo "Unsupported hardware. Network interfaces not initialized"
@@ -114,6 +104,26 @@ ipq40xx_setup_interfaces()
 	esac
 }
 
+ipq40xx_setup_dsl()
+{
+	local board="$1"
+	local annex="j"
+	local tone="b"
+	local xfer_mode=""
+
+	case "$board" in
+	avm,fritzbox-7530)
+		;;
+	*)
+		return 0
+		;;
+	esac
+
+	ucidef_add_atm_bridge "1" "32" "llc" "bridged" "dsl"
+	ucidef_add_vdsl_modem "$annex" "$tone" "$xfer_mode"
+	ucidef_set_interface_wan "dsl0" "pppoe"
+}
+
 ipq40xx_setup_macs()
 {
 	local board="$1"
@@ -125,15 +135,25 @@ ipq40xx_setup_macs()
 	8dev,habanero-dvk)
 		label_mac=$(mtd_get_mac_binary "ART" 0x1006)
 		;;
+	asus,rt-ac42u)
+		label_mac=$(mtd_get_mac_binary_ubi Factory 0x1006)
+		;;
 	asus,rt-ac58u)
-		CI_UBIPART=UBI_DEV
 		wan_mac=$(mtd_get_mac_binary_ubi Factory 0x1006)
 		lan_mac=$(mtd_get_mac_binary_ubi Factory 0x5006)
 		label_mac=$wan_mac
 		;;
+	avm,fritzbox-7530)
+		local tffsdev=$(find_mtd_chardev "nand-tffs")
+		wan_mac=$(/usr/bin/fritz_tffs_nand -b -d $tffsdev -n macdsl)
+		;;
 	cilab,meshpoint-one)
 		label_mac=$(mtd_get_mac_binary "ART" 0x1006)
 		;;
+	devolo,magic-2-wifi-next)
+		lan_mac=$(mtd_get_mac_ascii APPSBLENV MacAddress0)
+		label_mac=$lan_mac
+		;;
 	dlink,dap-2610)
 		lan_mac=$(mtd_get_mac_ascii bdcfg lanmac)
 		label_mac=$lan_mac
@@ -155,10 +175,36 @@ ipq40xx_setup_macs()
 	ezviz,cs-w3-wd1200g-eup)
 		label_mac=$(mtd_get_mac_binary "ART" 0x6)
 		;;
-	linksys,ea6350v3)
+	google,wifi)
+		wan_mac=$(get_mac_label)
+		lan_mac=$(macaddr_add "$wan_mac" 1)
+		;;
+	linksys,ea6350v3|\
+	linksys,ea8300  |\
+	linksys,mr8300)
 		wan_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
 		lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
+	mikrotik,cap-ac |\
+	mikrotik,hap-ac2|\
+	mikrotik,hap-ac3|\
+	mikrotik,hap-ac3-lte6-kit)
+		wan_mac=$(cat /sys/firmware/mikrotik/hard_config/mac_base)
+		lan_mac=$(macaddr_add $wan_mac 1)
+		label_mac="$wan_mac"
+		;;
+	mikrotik,lhgg-60ad|\
+	mikrotik,sxtsq-5-ac)
+		lan_mac=$(cat /sys/firmware/mikrotik/hard_config/mac_base)
+		label_mac="$lan_mac"
+		;;
+	netgear,rbr50|\
+	netgear,rbs50|\
+	netgear,srr60|\
+	netgear,srs60|\
+	pakedge,wr-1)
+		wan_mac=$(macaddr_add $(get_mac_label) 1)
+		;;
 	esac
 
 	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
@@ -169,6 +215,7 @@ ipq40xx_setup_macs()
 board_config_update
 board=$(board_name)
 ipq40xx_setup_interfaces $board
+ipq40xx_setup_dsl $board
 ipq40xx_setup_macs $board
 board_config_flush