From 390e856cb2d99631be05750d888cf4aa0aef80f1 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 11 Apr 2014 20:40:24 +0000 Subject: [PATCH] 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 SVN-Revision: 40460 --- .../config/ltq-adsl-app/files/dsl_control | 8 ++++++-- .../config/ltq-vdsl-app/files/dsl_control | 13 ++++++++---- .../linux/lantiq/base-files/etc/init.d/dsl_fs | 13 ++++++++++++ .../base-files/etc/uci-defaults/02_network | 20 +++++++++---------- 4 files changed, 38 insertions(+), 16 deletions(-) create mode 100755 target/linux/lantiq/base-files/etc/init.d/dsl_fs 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 \ diff --git a/target/linux/lantiq/base-files/etc/init.d/dsl_fs b/target/linux/lantiq/base-files/etc/init.d/dsl_fs new file mode 100755 index 0000000000..975f5d8784 --- /dev/null +++ b/target/linux/lantiq/base-files/etc/init.d/dsl_fs @@ -0,0 +1,13 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2014 OpenWrt.org + +. /lib/functions.sh + +START=30 +start() { + MTD=$(find_mtd_index dsl_fw) + [ "$MTD" -gt 0 ] && { + mkdir -p /lib/firmware/dsl/ + mount -t jffs2 /dev/mtdblock$MTD /lib/firmware/dsl/ + } +} 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 ac06e5f278..02f4f6a5fb 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 <