4 files changed, 70 insertions, 82 deletions

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/01_leds b/target/linux/lantiq/base-files/etc/uci-defaults/01_leds
new file mode 100755
index 000000000..bdf131170
--- /dev/null
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/01_leds
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# Copyright (C) 2011 OpenWrt.org
+# based on ar71xx
+#
+
+. /lib/functions/uci-defaults.sh
+. /lib/functions/lantiq.sh
+
+[ -e "/sys/class/leds/wifi" ] && ucidef_set_led_wlan "wifi" "wifi" "wifi" "phy0tpt"
+[ -e "/sys/class/leds/usb" ] && ucidef_set_led_usbdev "usb" "usb" "usb" "1-1"
+[ -e "/sys/class/leds/dsl" ] &&	ucidef_set_led_netdev "dsl" "dsl" "dsl" "pppoe-wan"
+
+for a in `ls /sys/class/leds/`; do
+	grep -q "\[none\]" /sys/class/leds/$a/trigger
+	[ $? -eq 0 ] && ucidef_set_led_default $a $a $a `cat /sys/class/leds/$a/brightness`
+done
+
+board=$(lantiq_board_id)
+
+case "$board" in
+VG3503J)
+	ucidef_set_led_netdev "lan1" "lan1" "bt:green:lan1" "eth0"
+	ucidef_set_led_netdev "lan2" "lan2" "bt:green:lan2" "eth1"
+	ucidef_set_led_netdev "port1" "port1" "bt:green:port1" "eth0"
+	ucidef_set_led_netdev "port2" "port2" "bt:green:port2" "eth1"
+	ucidef_set_led_netdev "vdsl" "vdsl" "bt:green:dsl" "ptm0"
+	;;
+*)
+	;;
+esac
+
+ucidef_commit_leds
+
+exit 0
diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/network b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
index b40134d93..06390a73d 100755
--- a/target/linux/lantiq/base-files/etc/uci-defaults/network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -12,7 +12,6 @@ set_atm_wan() {
 	local payload=$4
 	uci batch <<EOF
 set network.atm='atm-bridge'
-set network.atm.unit='0'
 set network.atm.vpi='$vpi'
 set network.atm.vci='$vci'
 set network.atm.encaps='$encaps'
@@ -22,21 +21,15 @@ set network.wan.ifname='nas0'
 set network.wan.proto='pppoe'
 set network.wan.username='foo'
 set network.wan.password='bar'
-EOF
-}
-
-set_adsl() {
-	local fwannex=$1
-	local annex=$2
-	uci batch <<EOF
-set network.adsl='adsl-device'
-set network.adsl.fwannex='$fwannex'
-set network.adsl.annex='$annex'
+set network.wan.ipv6='1'
+set network.wan6='interface'
+set network.wan6.ifname='@wan'
+set network.wan6.proto='dhcpv6'
 EOF
 }
 
 . /lib/functions/uci-defaults.sh
-. /lib/lantiq.sh
+. /lib/functions/lantiq.sh
 
 touch /etc/config/network
 
@@ -47,40 +40,42 @@ vpi=1
 vci=32
 encaps="llc"
 payload="bridged"
-fwannex=$(lantiq_dsl_fwannex)
-board=$(lantiq_board_name)
-dsl=$(lantiq_soc_has_adsl)
+
+board=$(lantiq_board_id)
 
 case "$board" in
-# annex B with adm6996
+# adm6996
 ARV4520PW)
 	ucidef_set_interface_lan "eth0.1"
 	ucidef_add_switch "eth0" "1" "1"
 	ucidef_add_switch_vlan "eth0" "1" "3 2 1 0 5t"
-	set_adsl "b" "b2p"
 	;;
 
-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"
-	set_adsl "b" "b2p"
 	;;
 
-# annex A with ar8316
+# ar8316
 ARV4519PW|ARV7518PW)
 	ucidef_set_interface_lan "eth0.1"
 	ucidef_add_switch "eth0" "1" "1"
 	ucidef_add_switch_vlan "eth0" "1" "0t 2 3 4 5"
-	set_adsl "a" "a2p"
 	;;
 
-ARV7525PW|ARV4525PW|*)
-	set_adsl "$fwannex" "${fwannex}2p"
+WBMR)
+	ucidef_add_switch "eth0" "1" "0"
+	ucidef_add_switch_vlan "eth0" "1" "0 1 2 3 4 5"
+	;;
+
+VG3503J)
+	ucidef_set_interface_lan 'eth0 eth1'
 	;;
 esac
 
-[ -z "$dsl" ] || set_atm_wan "$vpi" "$vci" "$encaps" "$payload"
+[ -z "$(ls /lib/modules/`uname -r`/ltq_atm*)" ] || set_atm_wan "$vpi" "$vci" "$encaps" "$payload"
+
 
 uci commit network
 
diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/03_wireless-wps b/target/linux/lantiq/base-files/etc/uci-defaults/03_wireless-wps
new file mode 100644
index 000000000..f2412d7bc
--- /dev/null
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/03_wireless-wps
@@ -0,0 +1,16 @@
+. /lib/functions.sh
+. /lib/functions/lantiq.sh
+
+set_wps() {
+	uci set wireless.$1.wps_pushbutton=0
+	uci set wireless.$1.wps_device_name="OpenWrt - $(lantiq_board_name)"
+}
+
+board=$(lantiq_board_id)
+case $board in
+WBMR)
+	config_load wireless
+	config_foreach set_wps wifi-iface
+	uci commit wireless
+	;;
+esac
diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/leds b/target/linux/lantiq/base-files/etc/uci-defaults/leds
deleted file mode 100755
index 64b080f33..000000000
--- a/target/linux/lantiq/base-files/etc/uci-defaults/leds
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2011 OpenWrt.org
-# based on ar71xx
-#
-
-. /lib/functions/uci-defaults.sh
-. /lib/lantiq.sh
-
-board=$(lantiq_board_name)
-
-case "$board" in
-ARV4520PW|ARV452CPW)
-	ucidef_set_led_netdev "wifi" "wifi" "soc:blue:wifi" "wlan0"
-	ucidef_set_led_usbdev "usb" "USB" "soc:blue:usb" "1-1"
-	ucidef_set_led_default "fxs1" "fxs1" "soc:blue:fxs1" "1"
-	ucidef_set_led_default "fxs2" "fxs2" "soc:blue:fxs2" "1"
-	ucidef_set_led_default "online" "online" "soc:blue:internet" "1"
-	;;
-
-ARV7525PW)
-	ucidef_set_led_netdev "wifi" "wifi" "soc:green:wifi" "wlan0"
-	ucidef_set_led_default "fxs1" "fxs1" "soc:green:fxs1" "1"
-	ucidef_set_led_default "fxs2" "fxs2" "soc:green:fxs2" "1"
-	ucidef_set_led_default "dsl" "dsl" "soc:red:dsl" "1"
-	ucidef_set_led_default "online" "online" "soc:green:online" "1"
-	;;
-
-ARV4525PW)
-	ucidef_set_led_netdev "wifi" "wifi" "soc:green:wifi" "wlan0"
-	ucidef_set_led_default "fxs1" "fxs1" "soc:green:fxs1" "1"
-	ucidef_set_led_default "fxs2" "fxs2" "soc:green:fxs2" "1"
-	ucidef_set_led_default "dsl" "dsl" "soc:green:dsl" "1"
-	ucidef_set_led_default "online" "online" "soc:green:online" "1"
-	;;
-
-GIGASX76X)
-	ucidef_set_led_wlan "wifi" "wifi" "soc:green:wifi" "phy0radio"
-	ucidef_set_led_netdev "online" "online" "soc:green:online" "pppoe-wan"
-	ucidef_set_led_usbdev "usb" "USB" "soc:green:usb" "1-1"
-	;;
-
-ARV4519PW)
-	ucidef_set_led_wlan "wifi" "wifi" "soc:green:wifi" "phy0radio"
-	ucidef_set_led_netdev "internet" "internet" "soc:green:internet" "pppoe-wan"
-	ucidef_set_led_usbdev "usb" "USB" "soc:green:usb" "1-1"
-	;;
-
-ARV7518PW)
-	ucidef_set_led_wlan "wifi" "wifi" "soc:green:wifi" "phy0radio"
-	ucidef_set_led_netdev "internet" "internet" "soc:green:internet" "pppoe-wan"
-	ucidef_set_led_usbdev "usb" "USB" "soc:green:usb" "1-1"
-	;;
-esac
-
-ucidef_commit_leds
-
-exit 0