X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Flantiq%2Fbase-files%2Fetc%2Fuci-defaults%2F02_network;h=ac06e5f27826814e5362da80ff09ac16800277e5;hp=db5b58e97752a42b3ed3b275fcb3ea6847544c83;hb=9c8b1f7da16279f6b0481e50ac2e49213a887527;hpb=85037ee7ed637b7ffbc9dbbb8772e29087435ead

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_network b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
old mode 100755
new mode 100644
index db5b58e977..ac06e5f278
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -21,6 +21,34 @@ set network.wan.ifname='nas0'
 set network.wan.proto='pppoe'
 set network.wan.username='foo'
 set network.wan.password='bar'
+set network.wan.ipv6='1'
+set network.wan6='interface'
+set network.wan6.ifname='@wan'
+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
 }
 
@@ -34,41 +62,121 @@ ucidef_set_interface_lan 'eth0'
 
 vpi=1
 vci=32
+annex="a"
 encaps="llc"
 payload="bridged"
+lan_mac=""
+wan_mac=""
 
 board=$(lantiq_board_id)
 
 case "$board" in
 # adm6996
+ARV4510PW)
+	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
+	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" "3 2 1 0 5t"
+	;;
+
 ARV4520PW)
 	ucidef_set_interface_lan "eth0.1"
-	ucidef_add_switch "eth0" "1" "1"
-	ucidef_add_switch_vlan "eth0" "1" "3 2 1 0 5t"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "3 2 1 0 5t"
 	;;
 
-GIGASX76X)
+ACMP252|GIGASX76X)
 	ucidef_set_interface_lan "eth0.1"
-	ucidef_add_switch "eth0" "1" "1"
-	ucidef_add_switch_vlan "eth0" "1" "4 3 2 1 5t"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "4 3 2 1 5t"
 	;;
 
 # ar8316
-ARV4519PW|ARV7518PW)
+ARV4519PW|ARV7510PW22|ARV7518PW|ARV752DPW22)
+	ucidef_set_interface_lan "eth0.1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5"
+	;;
+
+# rtl8306g
+ARV7519PW)
+	lan_mac=$(mtd_get_mac_binary board_config 22)
+	wan_mac=$(macaddr_add "$lan_mac" 1)
 	ucidef_set_interface_lan "eth0.1"
-	ucidef_add_switch "eth0" "1" "1"
-	ucidef_add_switch_vlan "eth0" "1" "0t 2 3 4 5"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4t"
 	;;
 
 WBMR)
-	ucidef_add_switch "eth0" "1" "0"
-	ucidef_add_switch_vlan "eth0" "1" "0 1 2 3 4 5"
+	ucidef_set_interface_lan "eth0.1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0t 2 3 4 5"
+	;;
+
+VG3503J)
+	ucidef_set_interface_lan 'eth0'
+	uci set network.lan.type='none'
+	;;
+
+DGN3500*)
+	lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr)
+	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" "3 2 1 0 5t"
+	;;
+
+GR7000)
+	ucidef_set_interface_wan "eth0"
+	uci set network.lan.ifname=''
+	;;
+
+H201L)
+	ucidef_set_interface_lan "eth0.1"
+	ucidef_add_switch "switch0" "1" "1"
+	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" "0 1 2 3 5t"
+	;;
+
+P2812HNUFX)
+	ucidef_set_interface_lan 'eth0.1'
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 1 2 4 5 6t"
+	;;
+
+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
 
 uci commit network