From: Jo-Philipp Wich Date: Fri, 4 Dec 2015 12:32:44 +0000 (+0000) Subject: lantiq: switch from uci-defaults to board.d X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5ebc5de49dd8fa789be22798b4e6b3ebb1a52ad5;p=openwrt%2Fstaging%2Fkaloz.git lantiq: switch from uci-defaults to board.d Signed-off-by: Jo-Philipp Wich SVN-Revision: 47755 --- diff --git a/target/linux/lantiq/base-files/etc/board.d/01_leds b/target/linux/lantiq/base-files/etc/board.d/01_leds new file mode 100755 index 0000000000..2dc641e6bb --- /dev/null +++ b/target/linux/lantiq/base-files/etc/board.d/01_leds @@ -0,0 +1,79 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# based on ar71xx +# + +. /lib/functions/uci-defaults-new.sh +. /lib/functions/lantiq.sh + +board_config_update + +[ -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/usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "usb2" "2-1" +[ -e "/sys/class/leds/internet" ] && ucidef_set_led_netdev "internet" "internet" "internet" "pppoe-wan" + +board=$(lantiq_board_name) + +case "$board" in +VG3503J) + ucidef_set_led_netdev "vdsl" "vdsl" "bt:green:dsl" "ptm0" + ;; +BTHOMEHUBV2B) + ucidef_set_led_default "power" "power" "soc:blue:power" "1" +# ucidef_set_led_wlan "wifi" "wifi" "soc:blue:wireless" "phy0radio" + ucidef_set_led_wlan "wifi" "wifi" "soc:blue:wireless" "phy0tpt" + ucidef_set_led_netdev "internet" "internet" "soc:blue:broadband" "pppoa-wan" + ucidef_set_led_usbdev "usb" "usb" "soc:blue:phone" "1-1" + ;; +BTHOMEHUBV3A|BTHOMEHUBV5A) + ucidef_set_led_default "power" "power" "soc:blue:power" "1" + ucidef_set_led_wlan "wifi" "wifi" "soc:blue:wireless" "phy0tpt" + ucidef_set_led_netdev "internet" "internet" "soc:blue:broadband" "pppoa-wan" + ;; +VGV7510KW22) + ucidef_set_led_default "power" "power" "power" "1" + ucidef_set_led_default "power2" "power2" "power2" "0" + ucidef_set_led_wlan "wifi" "wifi" "wifi" "phy0radio" + ucidef_set_led_netdev "dsl" "dsl" "dsl" "nas0" + ucidef_set_led_netdev "internet_green" "internet_green" "internet_green" "pppoe-wan" + ;; +VGV7519) + ucidef_set_led_default "power" "power" "power" "0" + ucidef_set_led_default "power2" "power2" "power2" "1" + ucidef_set_led_wlan "wireless_yellow" "wireless_yellow" "wireless_yellow" "phy0radio" + ucidef_set_led_netdev "internet_yellow" "internet_yellow" "internet_yellow" "nas0" + ucidef_set_led_netdev "broadband_yellow" "broadband_yellow" "broadband_yellow" "pppoe-wan" + ;; +P2812HNUF*) + ucidef_set_led_default "power" "power" "power" "0" + ucidef_set_led_default "power2" "power2" "power2" "1" + ucidef_set_led_wlan "wireless_green" "wireless_green" "wireless_green" "phy0radio" + ucidef_set_led_netdev "dsl" "dsl" "dsl" "nas0" + ucidef_set_led_netdev "internet_green" "internet_green" "internet_green" "pppoe-wan" + ;; +ARV7519RW22) + ucidef_set_led_default "power" "power" "power" "1" + ucidef_set_led_netdev "internet_green" "internet_green" "internet_green" "pppoe-wan" + ucidef_set_led_netdev "lan" "lan" "lan" "eth0.1" + ;; +ARV8539PW22) + ucidef_set_led_default "power" "power" "soc:green:power" "1" + ucidef_set_led_default "power2" "power2" "soc:red:power" "0" + ucidef_set_led_wlan "wifi" "wifi" "soc:green:wireless" "phy0tpt" + ucidef_set_led_netdev "dsl" "dsl" "soc:green:dsl" "nas0" + ucidef_set_led_netdev "online" "online" "soc:green:online" "pppoe-wan" + ;; +*) + ;; +esac + +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_config_flush + +exit 0 diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network new file mode 100755 index 0000000000..039f57b92d --- /dev/null +++ b/target/linux/lantiq/base-files/etc/board.d/02_network @@ -0,0 +1,149 @@ +#!/bin/sh +# +# Copyright (C) 2011-2015 OpenWrt.org +# + +. /lib/functions/uci-defaults-new.sh +. /lib/functions/system.sh +. /lib/functions/lantiq.sh + +board_config_update + +vpi=1 +vci=32 +annex="a" +encaps="llc" +payload="bridged" +lan_mac="" +wan_mac="" + +board=$(lantiq_board_name) + +case "$board" in +# adm6996 +ARV4510PW) + lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "3:lan:1" "2:lan:2" "1:lan:3" "0:lan:4" "5t@eth0" + ;; + +ARV4520PW) + ucidef_add_switch "switch0" \ + "3:lan:1" "2:lan:2" "1:lan:3" "0:lan:4" "5t@eth0" + ;; + +ACMP252|GIGASX76X) + ucidef_add_switch "switch0" \ + "4:lan:1" "3:lan:2" "2:lan:3" "1:lan:4" "5t@eth0" + ;; + +# ar8316 +ARV4519PW|ARV7510PW22|ARV7518PW|ARV752DPW22|ARV8539PW22) + ucidef_add_switch "switch0" \ + "0t@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" + ;; + +# rtl8306g +ARV7519PW) + lan_mac=$(mtd_get_mac_binary board_config 22) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4t@eth0" + ;; + +WBMR) + ucidef_add_switch "switch0" \ + "0t@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" + ;; + +VG3503J) + ucidef_set_interface_lan 'eth0' + ;; + +DGN3500*) + ucidef_add_switch "switch0" \ + "3:lan:1" "2:lan:2" "1:lan:3" "0:lan:4" "5t@eth0" + ;; + +GR7000) + ucidef_set_interface_wan "eth0" + ;; + +H201L) + ucidef_add_switch "switch0" \ + "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "4t@eth0" + ;; + +#rtl8306g +P2601HNFX) + ucidef_add_switch "switch0" \ + "0:lan:1" "1:lan:2" "2:lan:3" "3:lan:4" "5t@eth0" + ;; + +P2812HNUF*) + lan_mac=$(mtd_get_mac_ascii uboot-env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "0:lan:1" "1:lan:2" "2:lan:3" "4:lan:4" "5:lan:5" "6t@eth0" + ;; + +TDW8970|TDW8980) + lan_mac=$(mtd_get_mac_binary boardconfig 61696) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "0:lan:1" "2:lan:2" "4:lan:3" "5:lan:4" "6t@eth0" + ;; + +ARV7519RW22) + lan_mac=$(mtd_get_mac_binary boardconfig 22) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "0:lan:1" "2:lan:2" "3:lan:3" "4:lan:4" "5:lan:5" "6t@eth0" + ;; + +BTHOMEHUBV2B|BTHOMEHUBV3A) + lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_set_interface_lan 'eth0' + ;; + +BTHOMEHUBV5A) + lan_mac=$(mtd_get_mac_binary caldata 4364) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "0:lan:1" "1:lan:2" "2:lan:3" "4:lan:4" "6t@eth0" + ;; + +VGV7519) + lan_mac=$(mtd_get_mac_binary board_config 22) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_set_interface_lan 'eth0' + ;; + +VGV7510KW22) + lan_mac=$(mtd_get_mac_binary board_config 22) + wan_mac=$(macaddr_add "$lan_mac" 1) + ucidef_add_switch "switch0" \ + "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "6t@eth0" + ;; + +esac + +if [ -z "$(ls /lib/modules/`uname -r`/ltq_atm*)" ]; then + ucidef_add_atm_bridge "$vpi" "$vci" "$encaps" "$payload" + ucidef_set_interface_wan "nas0" "pppoe" +fi + +if [ -n "$(grep "system type.*: VR9" /proc/cpuinfo)" ]; then + ucidef_add_vdsl_modem "$annex" "/lib/firmware/vdsl.bin" "av" "ptm" +else + ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" +fi + +[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan "$lan_mac" +[ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan "$wan_mac" + +board_config_flush + +exit 0 diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/01_leds b/target/linux/lantiq/base-files/etc/uci-defaults/01_leds deleted file mode 100644 index b9e5420f07..0000000000 --- a/target/linux/lantiq/base-files/etc/uci-defaults/01_leds +++ /dev/null @@ -1,77 +0,0 @@ -#!/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/usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "usb2" "2-1" -[ -e "/sys/class/leds/internet" ] && ucidef_set_led_netdev "internet" "internet" "internet" "pppoe-wan" - -board=$(lantiq_board_name) - -case "$board" in -VG3503J) - ucidef_set_led_netdev "vdsl" "vdsl" "bt:green:dsl" "ptm0" - ;; -BTHOMEHUBV2B) - ucidef_set_led_default "power" "power" "soc:blue:power" "1" -# ucidef_set_led_wlan "wifi" "wifi" "soc:blue:wireless" "phy0radio" - ucidef_set_led_wlan "wifi" "wifi" "soc:blue:wireless" "phy0tpt" - ucidef_set_led_netdev "internet" "internet" "soc:blue:broadband" "pppoa-wan" - ucidef_set_led_usbdev "usb" "usb" "soc:blue:phone" "1-1" - ;; -BTHOMEHUBV3A|BTHOMEHUBV5A) - ucidef_set_led_default "power" "power" "soc:blue:power" "1" - ucidef_set_led_wlan "wifi" "wifi" "soc:blue:wireless" "phy0tpt" - ucidef_set_led_netdev "internet" "internet" "soc:blue:broadband" "pppoa-wan" - ;; -VGV7510KW22) - ucidef_set_led_default "power" "power" "power" "1" - ucidef_set_led_default "power2" "power2" "power2" "0" - ucidef_set_led_wlan "wifi" "wifi" "wifi" "phy0radio" - ucidef_set_led_netdev "dsl" "dsl" "dsl" "nas0" - ucidef_set_led_netdev "internet_green" "internet_green" "internet_green" "pppoe-wan" - ;; -VGV7519) - ucidef_set_led_default "power" "power" "power" "0" - ucidef_set_led_default "power2" "power2" "power2" "1" - ucidef_set_led_wlan "wireless_yellow" "wireless_yellow" "wireless_yellow" "phy0radio" - ucidef_set_led_netdev "internet_yellow" "internet_yellow" "internet_yellow" "nas0" - ucidef_set_led_netdev "broadband_yellow" "broadband_yellow" "broadband_yellow" "pppoe-wan" - ;; -P2812HNUF*) - ucidef_set_led_default "power" "power" "power" "0" - ucidef_set_led_default "power2" "power2" "power2" "1" - ucidef_set_led_wlan "wireless_green" "wireless_green" "wireless_green" "phy0radio" - ucidef_set_led_netdev "dsl" "dsl" "dsl" "nas0" - ucidef_set_led_netdev "internet_green" "internet_green" "internet_green" "pppoe-wan" - ;; -ARV7519RW22) - ucidef_set_led_default "power" "power" "power" "1" - ucidef_set_led_netdev "internet_green" "internet_green" "internet_green" "pppoe-wan" - ucidef_set_led_netdev "lan" "lan" "lan" "eth0.1" - ;; -ARV8539PW22) - ucidef_set_led_default "power" "power" "soc:green:power" "1" - ucidef_set_led_default "power2" "power2" "soc:red:power" "0" - ucidef_set_led_wlan "wifi" "wifi" "soc:green:wireless" "phy0tpt" - ucidef_set_led_netdev "dsl" "dsl" "soc:green:dsl" "nas0" - ucidef_set_led_netdev "online" "online" "soc:green:online" "pppoe-wan" - ;; -*) - ;; -esac - -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 - -ucidef_commit_leds - -exit 0 diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_network b/target/linux/lantiq/base-files/etc/uci-defaults/02_network deleted file mode 100644 index b22060c414..0000000000 --- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network +++ /dev/null @@ -1,211 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2011-2012 OpenWrt.org -# - -[ -e /etc/config/network ] && exit 0 - -set_atm_wan() { - local vpi=$1 - local vci=$2 - local encaps=$3 - local payload=$4 - uci batch <