X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fbase-files%2Fetc%2Fboard.d%2F02_network;h=bc5c410e65fb108569be811612be187fd303d731;hb=2dc9c8206b7a452ab6977945206ce9384b2d5f3f;hp=3f61326259cf0bc346348c62b027b9339c2aa619;hpb=96f6bd501a3b57813e698ad2b531f115f710c75e;p=openwrt%2Fstaging%2Fmkresin.git

diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network
index 3f61326259..bc5c410e65 100755
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -12,30 +12,34 @@ board_config_update
 vpi=1
 vci=32
 annex="a"
+tone="av"
+xfer_mode=""
 encaps="llc"
 payload="bridged"
 lan_mac=""
 wan_mac=""
 interface_wan=""
 
-board=$(lantiq_board_name)
+board=$(board_name)
 
 case "$board" in
-ARV4510PW)
-	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
+ACMP252|GIGASX76X)
 	ucidef_add_switch "switch0" \
-		"0:lan:4" "2:lan:2" "1:lan:3" "3:lan:1" "5t@eth0"
+		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0"
 	;;
 
-ARV4520PW)
-	ucidef_add_switch "switch0" \
-		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0"
+ALL0333CJ)
+	annex="b"
+	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+	wan_mac=$(macaddr_add "$lan_mac" 1)
+	ucidef_set_interface_lan 'eth0'
 	;;
 
-ACMP252|GIGASX76X)
+ARV4510PW)
+	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+	wan_mac=$(macaddr_add "$lan_mac" 1)
 	ucidef_add_switch "switch0" \
-		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0"
+		"0:lan:4" "2:lan:2" "1:lan:3" "3:lan:1" "5t@eth0"
 	;;
 
 ARV4519PW|ARV7510PW22|ARV7518PW|ARV752DPW22|ARV8539PW22)
@@ -43,6 +47,11 @@ ARV4519PW|ARV7510PW22|ARV7518PW|ARV752DPW22|ARV8539PW22)
 		"0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
 	;;
 
+ARV4520PW)
+	ucidef_add_switch "switch0" \
+		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0"
+	;;
+
 ARV7506PW11)
 	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2)
 	ucidef_add_switch "switch0" \
@@ -55,9 +64,37 @@ ARV7519PW)
 		"0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0"
 	;;
 
-WBMR)
+ARV7519RW22)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 22)" 1)
 	ucidef_add_switch "switch0" \
-		"0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
+		"0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0"
+	;;
+
+ASL56026)
+	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+	wan_mac=$(mtd_get_mac_ascii uboot_env wanmac)
+	ucidef_add_switch "switch0"\
+		"2:lan" "3:lan" "6t@eth0"
+	;;
+
+BTHOMEHUBV2B)
+	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+	wan_mac=$(macaddr_add "$lan_mac" 1)
+	ucidef_add_switch "switch0" \
+		"1:lan" "2:lan" "3:lan" "4:lan" "5t@eth0"
+	;;
+
+BTHOMEHUBV3A)
+	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+	wan_mac=$(macaddr_add "$lan_mac" 1)
+	ucidef_set_interface_lan 'eth0'
+	;;
+
+BTHOMEHUBV5A)
+	lan_mac=$(mtd_get_mac_binary_ubi caldata 4364)
+	wan_mac=$(macaddr_add "$lan_mac" 1)
+	ucidef_add_switch "switch0" \
+		"0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0"
 	;;
 
 DGN3500*)
@@ -65,7 +102,29 @@ DGN3500*)
 		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0"
 	;;
 
+DM200)
+	lan_mac=$(mtd_get_mac_binary ART 0)
+	wan_mac=$(macaddr_add "$lan_mac" 1)
+	ucidef_set_interface_lan 'eth0'
+	;;
+
+EASY80920NAND|EASY80920NOR)
+	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+	wan_mac=$(macaddr_add "$lan_mac" 1)
+	ucidef_add_switch "switch0" \
+		"0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0"
+	;;
+
+FRITZ3370)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 2439)" 1)
+	;;
+
+FRITZ7320)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 2705)" 1)
+	;;
+
 FRITZ7360SL)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary urlader 2705)" 1)
 	ucidef_add_switch "switch0" \
 		"0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
 	;;
@@ -84,7 +143,7 @@ P2812HNUF*)
 	lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr)
 	wan_mac=$(macaddr_add "$lan_mac" 1)
 	ucidef_add_switch "switch0" \
-		"0:lan" "1:lan" "2:lan" "4:lan" "5:lan" "6t@eth0"
+		"0:lan" "1:lan" "2:lan" "4:lan" "5:wan" "6t@eth0"
 	;;
 
 TDW8970|TDW8980)
@@ -93,61 +152,41 @@ TDW8970|TDW8980)
 		"0:lan:2" "2:lan:3" "4:lan:4" "5:lan:1" "6t@eth0"
 	;;
 
-VR200v)
-	wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 61696)" 1)
-	ucidef_add_switch "switch0" \
-		"0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0"
-	;;
-
-ARV7519RW22)
-	wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 22)" 1)
-	ucidef_add_switch "switch0" \
-		"0:lan" "2:lan" "3:lan" "4:lan" "5:lan" "6t@eth0"
-	;;
-
-BTHOMEHUBV2B)
-	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+VG3503J)
+	lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr)
 	wan_mac=$(macaddr_add "$lan_mac" 1)
 	ucidef_add_switch "switch0" \
-		"1:lan" "2:lan" "3:lan" "4:lan" "5t@eth0"
+		"2:lan:1" "4:lan:2" "6t@eth0"
 	;;
 
-BTHOMEHUBV3A)
-	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
-	ucidef_set_interface_lan 'eth0'
+VR200v)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 61696)" 1)
+	ucidef_add_switch "switch0" \
+		"0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0"
 	;;
 
-BTHOMEHUBV5A)
-	wan_mac=$(macaddr_add "$(mtd_get_mac_binary caldata 4364)" 1)
+VGV7510KW22*)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2)
 	ucidef_add_switch "switch0" \
-		"0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
+		"2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "0:wan:5" "6t@eth0"
 	;;
 
-VGV7519)
-	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 1)
+VGV7519*)
+	wan_mac=$(mtd_get_mac_binary board_config 22)
 	ucidef_add_switch "switch0" \
-		"0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "6t@eth0"
+		"0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0"
 	;;
 
-VGV7510KW22)
-	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 1)
+WBMR)
 	ucidef_add_switch "switch0" \
-		"2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "6t@eth0"
+		"0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
 	;;
 
 WBMR300)
 	lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr)
 	wan_mac="$lan_mac"
 	ucidef_add_switch "switch0" \
-		"2:lan:2" "3:lan:3" "5:lan:4" "4:wan:1" "6t@eth0"
-	;;
-
-EASY80920NAND|EASY80920NOR)
-	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
-	ucidef_add_switch "switch0" \
-		"0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0"
+		"5:lan:2" "2:lan:3" "3:lan:4" "4:wan:1" "6t@eth0"
 	;;
 
 *)
@@ -156,13 +195,12 @@ EASY80920NAND|EASY80920NOR)
 
 esac
 
-if [ -n "$(ls /lib/modules/`uname -r`/ltq_atm*)" ]; then
+ls /lib/modules/$(uname -r)/ltq_atm* 1> /dev/null 2>&1 && \
 	ucidef_add_atm_bridge "$vpi" "$vci" "$encaps" "$payload"
-fi
 
-if grep -qE "system type.*: (VR9|xRX200)" /proc/cpuinfo; then
-	interface_wan="ptm0"
-	ucidef_add_vdsl_modem "$annex" "av" "ptm"
+if lantiq_is_vdsl_system; then
+	interface_wan="dsl0"
+	ucidef_add_vdsl_modem "$annex" "$tone" "$xfer_mode"
 else
 	interface_wan="nas0"
 	ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin"
@@ -170,9 +208,10 @@ fi
 
 ucidef_set_interface_wan "$interface_wan" "pppoe"
 
-[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan "$lan_mac"
-[ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan "$wan_mac"
+[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
+[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac"
 
 board_config_flush
 
 exit 0
+