aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-04-11 20:40:24 +0000
committerJohn Crispin <john@openwrt.org>2014-04-11 20:40:24 +0000
commit390e856cb2d99631be05750d888cf4aa0aef80f1 (patch)
treeede39e6bf97ae57f7e68ab90a081ab5ad311ecee /package
parent7b960069a2f6ebee63bdb5a33522dae4ade5e8bf (diff)
downloadupstream-390e856cb2d99631be05750d888cf4aa0aef80f1.tar.gz
upstream-390e856cb2d99631be05750d888cf4aa0aef80f1.tar.bz2
upstream-390e856cb2d99631be05750d888cf4aa0aef80f1.zip
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
Diffstat (limited to 'package')
-rw-r--r--package/network/config/ltq-adsl-app/files/dsl_control8
-rw-r--r--package/network/config/ltq-vdsl-app/files/dsl_control13
2 files changed, 15 insertions, 6 deletions
diff --git a/package/network/config/ltq-adsl-app/files/dsl_control b/package/network/config/ltq-adsl-app/files/dsl_control
index e48b72b059..fef0834b12 100644
--- a/package/network/config/ltq-adsl-app/files/dsl_control
+++ b/package/network/config/ltq-adsl-app/files/dsl_control
@@ -38,11 +38,15 @@ start() {
eval "xtu=\"\${annex_$annex}\""
[ -z "${firmware}" ] &&
- firmware=adsl.bin
+ firmware=/lib/firmware/adsl.bin
+ [ -f "${firmware}" ] || {
+ echo failed to find $firmware
+ return 1
+ }
service_start /sbin/dsl_cpe_control -i${xtu} \
-n /sbin/dsl_notify.sh \
- -f /lib/firmware/${firmware}
+ -f ${firmware}
}
stop() {
diff --git a/package/network/config/ltq-vdsl-app/files/dsl_control b/package/network/config/ltq-vdsl-app/files/dsl_control
index c6be228494..7c423114cb 100644
--- a/package/network/config/ltq-vdsl-app/files/dsl_control
+++ b/package/network/config/ltq-vdsl-app/files/dsl_control
@@ -1,7 +1,8 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2012 OpenWrt.org
-START=99
+# needs to start before the atm layer which starts at 50
+START=48
EXTRA_COMMANDS="status lucistat"
EXTRA_HELP=" status Get DSL status information
@@ -153,7 +154,7 @@ start() {
esac
eval "xtse_adsl=\"\${xtse_adsl_$annex}\""
- [ -z "${xtse_adsl}" ] && xtse_adsl=$xtse_adsl_b
+ [ -z "${xtse_adsl}" ] && xtse_adsl=$xtse_adsl_a
eval "tone_adsl=\"\${tone_adsl_$tone}\""
[ -z "${tone_adsl}" ] && tone_adsl=$tone_adsl_av
@@ -161,7 +162,11 @@ start() {
eval "tone_vdsl=\"\${tone_vdsl_$tone}\""
[ -z "${tone_vdsl}" ] && tone_vdsl=$tone_vdsl_av
- [ -z "${firmware}" ] && firmware=vdsl.bin
+ [ -z "${firmware}" ] && firmware=/lib/firmware/vdsl.bin
+ [ -f "${firmware}" ] || {
+ echo failed to find $firmware
+ return 1
+ }
xdsl_scr adsl "${xtse_adsl}"
xdsl_scr vdsl "${xtse_vdsl}"
@@ -170,7 +175,7 @@ start() {
service_start /sbin/vdsl_cpe_control \
-i `echo $xtse_adsl | sed "s/ /_/g"` \
-n /sbin/dsl_notify.sh \
- -f /lib/firmware/${firmware} \
+ -f ${firmware} \
-a /tmp/adsl.scr \
-A /tmp/vdsl.scr \
-l /tmp/lowlevel.cfg \