lantiq: fix WBMR-300HPD switch port assignment

[openwrt/openwrt.git] / target / linux / lantiq / base-files / etc / board.d / 02_network

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 039f57b92d6741d4a8e49b620f94d404d911fed8..d6f66016f64f7295ac90280758d5823b1275092b 100755 (executable)
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -3,7 +3,7 @@
 # Copyright (C) 2011-2015 OpenWrt.org
 #
 
-. /lib/functions/uci-defaults-new.sh
+. /lib/functions/uci-defaults.sh
 . /lib/functions/system.sh
 . /lib/functions/lantiq.sh
 
@@ -16,6 +16,7 @@ encaps="llc"
 payload="bridged"
 lan_mac=""
 wan_mac=""
+interface_wan=""
 
 board=$(lantiq_board_name)
 
@@ -44,6 +45,14 @@ ARV4519PW|ARV7510PW22|ARV7518PW|ARV752DPW22|ARV8539PW22)
                "0t@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4"
        ;;
 
+# rtl8306g
+ARV7506PW11)
+       lan_mac=$(mtd_get_mac_binary board_config 22)
+       wan_mac=$(macaddr_add "$lan_mac" 2)
+       ucidef_add_switch "switch0" \
+               "4:lan:1" "3:lan:2" "2:lan:3" "1:lan:4" "5t@eth0"
+       ;;
+
 # rtl8306g
 ARV7519PW)
        lan_mac=$(mtd_get_mac_binary board_config 22)
@@ -61,13 +70,18 @@ VG3503J)
        ucidef_set_interface_lan 'eth0'
        ;;
 
+ARV4518PWR01*)
+        ucidef_set_interface_lan 'eth0'
+        ;;
+
 DGN3500*)
        ucidef_add_switch "switch0" \
                "3:lan:1" "2:lan:2" "1:lan:3" "0:lan:4" "5t@eth0"
        ;;
 
-GR7000)
-       ucidef_set_interface_wan "eth0"
+FRITZ7360SL)
+       ucidef_add_switch "switch0" \
+               "4:lan:1" "2:lan:2" "0:lan:3" "1:lan:4" "6t@eth0"
        ;;
 
 H201L)
@@ -95,6 +109,13 @@ TDW8970|TDW8980)
                "0:lan:1" "2:lan:2" "4:lan:3" "5:lan:4" "6t@eth0"
        ;;
 
+VR200v)
+       lan_mac=$(mtd_get_mac_binary romfile 61696)
+       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"
+       ;;
+
 ARV7519RW22)
        lan_mac=$(mtd_get_mac_binary boardconfig 22)
        wan_mac=$(macaddr_add "$lan_mac" 1)
@@ -118,7 +139,8 @@ BTHOMEHUBV5A)
 VGV7519)
        lan_mac=$(mtd_get_mac_binary board_config 22)
        wan_mac=$(macaddr_add "$lan_mac" 1)
-       ucidef_set_interface_lan 'eth0'
+       ucidef_add_switch "switch0" \
+               "4:lan:1" "2:lan:2" "1:lan:3" "0:lan:4" "6t@eth0"
        ;;
 
 VGV7510KW22)
@@ -128,19 +150,33 @@ VGV7510KW22)
                "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "6t@eth0"
        ;;
 
+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"
+       ;;
+
+*)
+       ucidef_set_interface_lan 'eth0'
+       ;;
+
 esac
 
-if [ -z "$(ls /lib/modules/`uname -r`/ltq_atm*)" ]; then
+if [ -n "$(ls /lib/modules/`uname -r`/ltq_atm*)" ]; then
        ucidef_add_atm_bridge "$vpi" "$vci" "$encaps" "$payload"
-       ucidef_set_interface_wan "nas0" "pppoe"
 fi
 
-if [ -n "$(grep "system type.*: VR9" /proc/cpuinfo)" ]; then
-       ucidef_add_vdsl_modem "$annex" "/lib/firmware/vdsl.bin" "av" "ptm"
+if grep -qE "system type.*: (VR9|xRX200)" /proc/cpuinfo; then
+       interface_wan="ptm0"
+       ucidef_add_vdsl_modem "$annex" "av" "ptm"
 else
+       interface_wan="nas0"
        ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin"
 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"