X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fbase-files%2Fetc%2Fboard.d%2F02_network;h=576bb7d86bc8f2746e96bde716f51e553a4dd774;hp=a3dc80c54b16d31e3950c3881e3d4f202ea205a2;hb=bececcce868eff1864c60c87c9b82cb8114510cf;hpb=492964e741f1e0254b6ed7c0a095551a31d25dc9

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 a3dc80c54b..576bb7d86b 100755
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -21,138 +21,153 @@ interface_wan=""
 board=$(lantiq_board_name)
 
 case "$board" in
-# adm6996
+ACMP252|GIGASX76X)
+	ucidef_add_switch "switch0" \
+		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0"
+	;;
+
 ARV4510PW)
 	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
 	wan_mac=$(macaddr_add "$lan_mac" 1)
 	ucidef_add_switch "switch0" \
-		"3:lan:1" "2:lan:2" "1:lan:3" "0:lan:4" "5t@eth0"
+		"0:lan:4" "2:lan:2" "1:lan:3" "3:lan:1" "5t@eth0"
 	;;
 
-ARV4520PW)
+ARV4519PW|ARV7510PW22|ARV7518PW|ARV752DPW22|ARV8539PW22)
 	ucidef_add_switch "switch0" \
-		"3:lan:1" "2:lan:2" "1:lan:3" "0:lan:4" "5t@eth0"
+		"0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
 	;;
 
-ACMP252|GIGASX76X)
+ARV4520PW)
 	ucidef_add_switch "switch0" \
-		"4:lan:1" "3:lan:2" "2:lan:3" "1:lan:4" "5t@eth0"
+		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0"
 	;;
 
-# ar8316
-ARV4519PW|ARV7510PW22|ARV7518PW|ARV752DPW22|ARV8539PW22)
+ARV7506PW11)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2)
 	ucidef_add_switch "switch0" \
-		"0t@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4"
+		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5t@eth0"
 	;;
 
-# rtl8306g
 ARV7519PW)
-	lan_mac=$(mtd_get_mac_binary board_config 22)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 1)
 	ucidef_add_switch "switch0" \
-		"0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4t@eth0"
+		"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:1" "3:lan:2" "4:lan:3" "5:lan:4"
+		"0:lan:5" "2:lan:3" "3:lan:4" "4:lan:1" "5:lan:2" "6t@eth0"
 	;;
 
-VG3503J)
+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'
 	;;
 
-ARV4518PWR01*)
-        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" "6t@eth0"
+	;;
 
 DGN3500*)
-	eth0_mac=$(mtd_get_mac_ascii uboot-env ethaddr)
-	nas0_mac=$(macaddr_add "$eth0_mac" 1)
-	ifconfig eth0 hw ether "$eth0_mac"
-	ifconfig wlan0 hw ether "$eth0_mac"
-	esi $(echo "$nas0_mac" | tr -d :)
 	ucidef_add_switch "switch0" \
-		"3:lan:1" "2:lan:2" "1:lan:3" "0:lan:4" "5t@eth0"
+		"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5t@eth0"
 	;;
 
-GR7000)
-	ucidef_set_interface_wan "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"
+	;;
+
+FRITZ7360SL)
+	ucidef_add_switch "switch0" \
+		"0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
 	;;
 
 H201L)
 	ucidef_add_switch "switch0" \
-		"0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4t@eth0"
+		"0:lan" "1:lan" "2:lan" "3:lan" "4t@eth0"
 	;;
 
-#rtl8306g
 P2601HNFX)
 	ucidef_add_switch "switch0" \
-		"0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "5t@eth0"
+		"0:lan" "1:lan" "2:lan" "3:lan" "5t@eth0"
 	;;
 
 P2812HNUF*)
 	lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr)
 	wan_mac=$(macaddr_add "$lan_mac" 1)
 	ucidef_add_switch "switch0" \
-		"0:lan:1" "1:lan:2" "2:lan:3" "4:lan:4" "5:lan:5" "6t@eth0"
+		"0:lan" "1:lan" "2:lan" "4:lan" "5:lan" "6t@eth0"
 	;;
 
 TDW8970|TDW8980)
-	lan_mac=$(mtd_get_mac_binary boardconfig 61696)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary boardconfig 61696)" 1)
 	ucidef_add_switch "switch0" \
-		"0:lan:1" "2:lan:2" "4:lan:3" "5:lan:4" "6t@eth0"
+		"0:lan:2" "2:lan:3" "4:lan:4" "5:lan:1" "6t@eth0"
 	;;
 
-VR200v)
-	lan_mac=$(mtd_get_mac_binary romfile 61696)
+VG3503J)
+	lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr)
 	wan_mac=$(macaddr_add "$lan_mac" 1)
 	ucidef_add_switch "switch0" \
-		"0:lan:1" "2:lan:2" "4:lan:3" "5:lan:4" "6t@eth0"
+		"2:lan:1" "4:lan:2" "6t@eth0"
 	;;
 
-ARV7519RW22)
-	lan_mac=$(mtd_get_mac_binary boardconfig 22)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
+VR200v)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary romfile 61696)" 1)
 	ucidef_add_switch "switch0" \
-		"0:lan:1" "2:lan:2" "3:lan:3" "4:lan:4" "5:lan:5" "6t@eth0"
+		"0:lan" "2:lan" "4:lan" "5:lan" "6t@eth0"
 	;;
 
-BTHOMEHUBV2B|BTHOMEHUBV3A)
-	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
-	ucidef_set_interface_lan 'eth0'
+VGV7510KW22*)
+	wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2)
+	ucidef_add_switch "switch0" \
+		"2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "6t@eth0"
 	;;
 
-BTHOMEHUBV5A)
-	lan_mac=$(mtd_get_mac_binary caldata 4364)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
+VGV7519*)
+	wan_mac=$(mtd_get_mac_binary board_config 22)
 	ucidef_add_switch "switch0" \
-		"0:lan:1" "1:lan:2" "2:lan:3" "4:lan:4" "6t@eth0"
+		"0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "6t@eth0"
 	;;
 
-VGV7519)
-	lan_mac=$(mtd_get_mac_binary board_config 22)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
+WBMR)
 	ucidef_add_switch "switch0" \
-		"4:lan:1" "2:lan:2" "1:lan:3" "0:lan:4" "6t@eth0"
+		"0t@eth0" "2:lan" "3:lan" "4:lan" "5:lan"
 	;;
 
-VGV7510KW22)
-	lan_mac=$(mtd_get_mac_binary board_config 22)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
+WBMR300)
+	lan_mac=$(mtd_get_mac_ascii ubootconfig ethaddr)
+	wan_mac="$lan_mac"
 	ucidef_add_switch "switch0" \
-		"2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "6t@eth0"
+		"5:lan:2" "2:lan:3" "3:lan:4" "4:wan:1" "6t@eth0"
+	;;
+
+*)
+	ucidef_set_interface_lan 'eth0'
 	;;
 
 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
+if lantiq_is_vdsl_system; then
 	interface_wan="ptm0"
 	ucidef_add_vdsl_modem "$annex" "av" "ptm"
 else
@@ -162,9 +177,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
+