lantiq: add default switch setup to td8970

[openwrt/openwrt.git] / target / linux / lantiq / base-files / etc / uci-defaults / 02_network

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_network b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
index ac06e5f27826814e5362da80ff09ac16800277e5..8d9ae4f57f4e26bcbe60ef3686a62ae963a51710 100644 (file)
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -32,9 +32,9 @@ set_adsl_modem() {
        local annex=$1
        local firmware=$2
        uci batch <<EOF
-set network.adsl='dsl-modem'
-set network.adsl.annex='$annex'
-set network.adsl.firmware='$firmware'
+set network.dsl='adsl'
+set network.dsl.annex='$annex'
+set network.dsl.firmware='$firmware'
 EOF
 }
 
@@ -44,11 +44,11 @@ set_vdsl_modem() {
        local tone=$3
        local xfer_mode=$4
        uci batch <<EOF
-set network.vdsl='dsl-modem'
-set network.vdsl.annex='$annex'
-set network.vdsl.firmware='$firmware'
-set network.vdsl.tone='$tone'
-set network.vdsl.xfer_mode='$xfer_mode'
+set network.dsl='vdsl'
+set network.dsl.annex='$annex'
+set network.dsl.firmware='$firmware'
+set network.dsl.tone='$tone'
+set network.dsl.xfer_mode='$xfer_mode'
 EOF
 }
 
@@ -68,7 +68,7 @@ payload="bridged"
 lan_mac=""
 wan_mac=""
 
-board=$(lantiq_board_id)
+board=$(lantiq_board_name)
 
 case "$board" in
 # adm6996
@@ -154,9 +154,12 @@ P2812HNUFX)
 TDW8970)
        lan_mac=$(mtd_get_mac_binary boardconfig 61696)
        wan_mac=$(macaddr_add "$lan_mac" 1)
+       ucidef_set_interface_lan 'eth0.1'
+       ucidef_add_switch "switch0" "1" "1"
+       ucidef_add_switch_vlan "switch0" "1" "0 2 4 5 6t"
        ;;
 
-ARV7519*)
+ARV7519RW22)
        lan_mac=$(mtd_get_mac_binary boardconfig 22)
        wan_mac=$(macaddr_add "$lan_mac" 1)
        ;;
@@ -170,9 +173,9 @@ esac
 [ -z "$(ls /lib/modules/`uname -r`/ltq_atm*)" ] || set_atm_wan "$vpi" "$vci" "$encaps" "$payload"
 
 if [ -n "$(grep "system type.*: VR9" /proc/cpuinfo)" ]; then
-       set_vdsl_modem "$annex" "vdsl.bin" "bv" "ptm"
+       set_vdsl_modem "$annex" "/lib/firmware/vdsl.bin" "av" "ptm"
 else
-       set_adsl_modem "$annex" "adsl.bin"
+       set_adsl_modem "$annex" "/lib/firmware/adsl.bin"
 fi
 
 [ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac