diff options
| -rwxr-xr-x | target/linux/lantiq/base-files/etc/uci-defaults/leds | 35 | ||||
| -rwxr-xr-x | target/linux/lantiq/base-files/etc/uci-defaults/network | 119 |
2 files changed, 53 insertions, 101 deletions
diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/leds b/target/linux/lantiq/base-files/etc/uci-defaults/leds index 411e9d8828..2a7db4c1a8 100755 --- a/target/linux/lantiq/base-files/etc/uci-defaults/leds +++ b/target/linux/lantiq/base-files/etc/uci-defaults/leds @@ -83,6 +83,14 @@ EOF board=$(lantiq_board_name) case "$board" in +ARV4520PW|ARV452CPW) + set_led_netdev "wifi" "wifi" "soc:blue:wifi" "wlan0" + set_led_usbdev "usb" "USB" "soc:blue:usb" "1-1" + set_led_default "fxs1" "fxs1" "soc:blue:fxs1" "1" + set_led_default "fxs2" "fxs2" "soc:blue:fxs2" "1" + set_led_default "online" "online" "soc:blue:internet" "1" + ;; + ARV7525PW) set_led_netdev "wifi" "wifi" "soc:green:wifi" "wlan0" set_led_default "fxs1" "fxs1" "soc:green:fxs1" "1" @@ -91,15 +99,30 @@ ARV7525PW) set_led_default "online" "online" "soc:green:online" "1" ;; +ARV4525PW) + set_led_netdev "wifi" "wifi" "soc:green:wifi" "wlan0" + set_led_default "fxs1" "fxs1" "soc:green:fxs1" "1" + set_led_default "fxs2" "fxs2" "soc:green:fxs2" "1" + set_led_default "dsl" "dsl" "soc:green:dsl" "1" + set_led_default "online" "online" "soc:green:online" "1" + ;; + GIGASX76X) set_led_wlan "wifi" "wifi" "soc:green:wifi" "phy0radio" - set_led_netdev "online" "online" "soc:green:online" "nas0" + set_led_netdev "online" "online" "soc:green:online" "pppoe-wan" + set_led_usbdev "usb" "USB" "soc:green:usb" "1-1" + ;; + +ARV4519PW) + set_led_wlan "wifi" "wifi" "soc:green:wifi" "phy0radio" + set_led_netdev "internet" "internet" "soc:green:internet" "pppoe-wan" + set_led_usbdev "usb" "USB" "soc:green:usb" "1-1" + ;; + +ARV7518PW) + set_led_wlan "wifi" "wifi" "soc:green:wifi" "phy0radio" + set_led_netdev "internet" "internet" "soc:green:internet" "pppoe-wan" set_led_usbdev "usb" "USB" "soc:green:usb" "1-1" - set_led_default "adsl" "adsl" "soc:green:adsl" "0" - set_led_default "voip" "voip" "soc:green:voip" "0" - set_led_default "phone1" "fxs1" "soc:green:phone1" "0" - set_led_default "phone2" "fxs2" "soc:green:phone2" "0" - set_led_default "line" "line" "soc:green:line" "0" ;; esac diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/network b/target/linux/lantiq/base-files/etc/uci-defaults/network index 09f6bd7bff..94dea9a24e 100755 --- a/target/linux/lantiq/base-files/etc/uci-defaults/network +++ b/target/linux/lantiq/base-files/etc/uci-defaults/network @@ -1,51 +1,9 @@ #!/bin/sh # -# Copyright (C) 2011 OpenWrt.org +# Copyright (C) 2011-2012 OpenWrt.org # -set_interface_loopback() { - uci batch <<EOF -set network.loopback='interface' -set network.loopback.ifname='lo' -set network.loopback.proto='static' -set network.loopback.ipaddr='127.0.0.1' -set network.loopback.netmask='255.0.0.0' -EOF -} - -set_interface_raw() { - local cfg=$1 - local ifname=$2 - - uci batch <<EOF -set network.$cfg='interface' -set network.$cfg.ifname='$ifname' -set network.$cfg.proto='none' -EOF -} - -set_interface_lan() { - local ifname=$1 - - uci batch <<EOF -set network.lan='interface' -set network.lan.ifname='$ifname' -set network.lan.type='bridge' -set network.lan.proto='static' -set network.lan.ipaddr='192.168.1.1' -set network.lan.netmask='255.255.255.0' -EOF -} - -set_interface_wan() { - local ifname=$1 - - uci batch <<EOF -set network.wan='interface' -set network.wan.ifname='$ifname' -set network.wan.proto='dhcp' -EOF -} +[ -e /etc/config/network ] && exit 0 set_atm_wan() { local vpi=$1 @@ -59,8 +17,6 @@ set network.atm.vpi='$vpi' set network.atm.vci='$vci' set network.atm.encaps='$encaps' set network.atm.payload='$payload' -set network.atm.fwannex='$annex' -set network.atm.annex='$annex' set network.wan='interface' set network.wan.ifname='nas0' set network.wan.proto='pppoe' @@ -79,72 +35,45 @@ set network.adsl.annex='$annex' EOF } -set_interfaces_lan_wan() { - local lan_ifname=$1 - local wan_ifname=$2 - - set_interface_lan "$lan_ifname" - set_interface_wan "$wan_ifname" -} - -add_switch() { - local name=$1 - local reset=$2 - local enable=$3 - uci batch <<EOF -add network switch -set network.@switch[-1].name='$name' -set network.@switch[-1].reset='$reset' -set network.@switch[-1].enable_vlan='$enable' -EOF -} - -add_switch_vlan() { - local device=$1 - local vlan=$2 - local ports=$3 - uci batch <<EOF -add network switch_vlan -set network.@switch_vlan[-1].device='$device' -set network.@switch_vlan[-1].vlan='$vlan' -set network.@switch_vlan[-1].ports='$ports' -EOF -} - -[ -e /etc/config/network ] && exit 0 - +. /lib/functions/uci-defaults.sh . /lib/lantiq.sh touch /etc/config/network -set_interface_loopback -set_interface_lan 'eth0' - +ucidef_set_interface_loopback +ucidef_set_interface_lan 'eth0' vpi=1 vci=32 encaps="llc" payload="bridged" fwannex=$(lantiq_dsl_fwannex) -annex="$fwannex" - board=$(lantiq_board_name) +dsl=$(lantiq_soc_has_adsl) + case "$board" in -GIGASX76X) - set_interface_lan "eth0.1" - add_switch "eth0" "1" "1" - add_switch_vlan "eth0" "1" "1 2 3 4 5t" +# annex B with adm6996 +ARV4520PW|GIGASX76X) + ucidef_set_interface_lan "eth0.1" + ucidef_add_switch "eth0" "1" "1" + ucidef_add_switch_vlan "eth0" "1" "1 2 3 4 5t" + set_adsl "b" "b2p" ;; -*) - # custom foo goes here - true +# annex A with 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" ;; esac -dsl=$(lantiq_soc_has_adsl) -[ -z "$dsl" ] || set_atm_wan "$vpi" "vci" "$encaps" "$payload" "$annex" -[ -z "$fwannex" ] || set_adsl "$fwannex" "$annex" +[ -z "$dsl" ] || set_atm_wan "$vpi" "$vci" "$encaps" "$payload" uci commit network |