From 390e856cb2d99631be05750d888cf4aa0aef80f1 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Fri, 11 Apr 2014 20:40:24 +0000
Subject: lantiq: more vdsl related cleanups

* atm module needs to be loaded before linux-atm
* use absolute firmware paths
* extended validation
* add a script for mounting an optional firmware partition

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 40460
---
 .../lantiq/base-files/etc/uci-defaults/02_network    | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'target/linux/lantiq/base-files/etc/uci-defaults/02_network')

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_network b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
index ac06e5f..02f4f6a 100644
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -32,9 +32,9 @@ 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'
+set network.dsl='adsl'
+set network.dsl.annex='$annex'
+set network.dsl.firmware='$firmware'
 EOF
 }
 
@@ -44,11 +44,11 @@ set_vdsl_modem() {
 	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'
+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
 }
 
@@ -170,9 +170,9 @@ 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"
+	set_vdsl_modem "$annex" "/lib/firmware/vdsl.bin" "av" "ptm"
 else
-	set_adsl_modem "$annex" "adsl.bin"
+	set_adsl_modem "$annex" "/lib/firmware/adsl.bin"
 fi
 
 [ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac
-- 
cgit v1.1