lantiq: move the dsl-modem config to network.@dsl-modem[-1]

[openwrt/svn-archive/archive.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 329fa2d72e5180be1ffea3ef544bd608e5e86c2a..ac06e5f27826814e5362da80ff09ac16800277e5 100644 (file)
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -28,6 +28,30 @@ set network.wan6.proto='dhcpv6'
 EOF
 }
 
+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'
+EOF
+}
+
+set_vdsl_modem() {
+       local annex=$1
+       local firmware=$2
+       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'
+EOF
+}
+
 . /lib/functions/uci-defaults.sh
 . /lib/functions/lantiq.sh
 
@@ -38,6 +62,7 @@ ucidef_set_interface_lan 'eth0'
 
 vpi=1
 vci=32
+annex="a"
 encaps="llc"
 payload="bridged"
 lan_mac=""
@@ -113,12 +138,13 @@ H201L)
        ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4t"
        ;;
 
+#rtl8306g
 P2601HNFX)
        ucidef_set_interface_lan "eth0.1"
        ucidef_add_switch "switch0" "1" "1"
-       ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
+       ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
        ;;
-       
+
 P2812HNUFX)
        ucidef_set_interface_lan 'eth0.1'
        ucidef_add_switch "switch0" "1" "1"
@@ -129,9 +155,26 @@ TDW8970)
        lan_mac=$(mtd_get_mac_binary boardconfig 61696)
        wan_mac=$(macaddr_add "$lan_mac" 1)
        ;;
+
+ARV7519*)
+       lan_mac=$(mtd_get_mac_binary boardconfig 22)
+       wan_mac=$(macaddr_add "$lan_mac" 1)
+       ;;
+
+BTHOMEHUBV2B)
+       lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+       wan_mac=$(macaddr_add "$lan_mac" 1)
+       ;;
 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"
+else
+       set_adsl_modem "$annex" "adsl.bin"
+fi
+
 [ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac
 [ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan $wan_mac