lantiq: switch from uci-defaults to board.d

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 47755

3 files changed, 154 insertions, 214 deletions

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/01_leds b/target/linux/lantiq/base-files/etc/board.d/01_leds
index b9e5420f07..2dc641e6bb 100644..100755
--- a/target/linux/lantiq/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/lantiq/base-files/etc/board.d/01_leds
@@ -1,12 +1,14 @@
 #!/bin/sh
 #
-# Copyright (C) 2011 OpenWrt.org
+# Copyright (C) 2011-2015 OpenWrt.org
 # based on ar71xx
 #
 
-. /lib/functions/uci-defaults.sh
+. /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"
@@ -72,6 +74,6 @@ for a in `ls /sys/class/leds/`; do
 	[ $? -eq 0 ] && ucidef_set_led_default $a $a $a `cat /sys/class/leds/$a/brightness`
 done
 
-ucidef_commit_leds
+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/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 <<EOF
-set network.atm='atm-bridge'
-set network.atm.vpi='$vpi'
-set network.atm.vci='$vci'
-set network.atm.encaps='$encaps'
-set network.atm.payload='$payload'
-set network.wan='interface'
-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.dsl='adsl'
-set network.dsl.annex='$annex'
-set network.dsl.firmware='$firmware'
-EOF
-}
-
-set_vdsl_modem() {
-	local annex=$1
-	local firmware=$2
-	local tone=$3
-	local xfer_mode=$4
-	uci batch <<EOF
-set network.dsl='vdsl'
-set network.dsl.annex='$annex'
-set network.dsl.firmware='$firmware'
-set network.dsl.tone='$tone'
-set network.dsl.xfer_mode='$xfer_mode'
-EOF
-}
-
-. /lib/functions/uci-defaults.sh
-. /lib/functions/lantiq.sh
-
-touch /etc/config/network
-
-ucidef_set_interface_loopback
-ucidef_set_interface_lan 'eth0'
-
-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_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 "switch0" "1" "1"
-	ucidef_add_switch_vlan "switch0" "1" "3 2 1 0 5t"
-	;;
-
-ACMP252|GIGASX76X)
-	ucidef_set_interface_lan "eth0.1"
-	ucidef_add_switch "switch0" "1" "1"
-	ucidef_add_switch_vlan "switch0" "1" "4 3 2 1 5t"
-	;;
-
-# ar8316
-ARV4519PW|ARV7510PW22|ARV7518PW|ARV752DPW22|ARV8539PW22)
-	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 "switch0" "1" "1"
-	ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 4t"
-	;;
-
-WBMR)
-	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*)
-	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"
-	;;
-
-P2812HNUF*)
-	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" "0 1 2 4 5 6t"
-	;;
-
-TDW8970|TDW8980)
-	lan_mac=$(mtd_get_mac_binary boardconfig 61696)
-	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" "0 2 4 5 6t"
-	;;
-
-ARV7519RW22)
-	lan_mac=$(mtd_get_mac_binary boardconfig 22)
-	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" "0 2 3 4 5 6t"
-	;;
-
-BTHOMEHUBV2B|BTHOMEHUBV3A)
-	lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
-	;;
-
-BTHOMEHUBV5A)
-	lan_mac=$(mtd_get_mac_binary caldata 4364)
-	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" "0 1 2 4 6t"
-	;;
-
-VGV7519)
-	lan_mac=$(mtd_get_mac_binary board_config 22)
-	wan_mac=$(macaddr_add "$lan_mac" 1)
-	;;
-
-VGV7510KW22)
-	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 "switch0" "1" "1"
-	ucidef_add_switch_vlan "switch0" "1" "2 3 4 5 6t"
-	;;
-
-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" "/lib/firmware/vdsl.bin" "av" "ptm"
-else
-	set_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
-
-uci commit network
-
-exit 0