aboutsummaryrefslogtreecommitdiffstats
path: root/target
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 /target
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 'target')
-rwxr-xr-xtarget/linux/lantiq/base-files/etc/init.d/dsl_fs13
-rw-r--r--target/linux/lantiq/base-files/etc/uci-defaults/02_network20
2 files changed, 23 insertions, 10 deletions
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 <<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