diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-03-07 11:03:18 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-03-07 11:03:18 +0000 |
| commit | 85f21bb6487e3bd231ad1ba447c88f6eec826907 (patch) | |
| tree | e949fb1085b7bfaa6a606babbb38f945760396f9 | |
| parent | da607ff53e673bae9f202351331ea84943d50c46 (diff) | |
| download | master-187ad058-85f21bb6487e3bd231ad1ba447c88f6eec826907.tar.gz master-187ad058-85f21bb6487e3bd231ad1ba447c88f6eec826907.tar.bz2 master-187ad058-85f21bb6487e3bd231ad1ba447c88f6eec826907.zip | |
lantiq: do not set default firmware file
We are now shipping a DSL firmware, do not set it by default to some
file name.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48941 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | package/base-files/files/lib/functions/uci-defaults.sh | 6 | ||||
| -rwxr-xr-x | target/linux/lantiq/base-files/etc/board.d/02_network | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh index 512e0ed8bd..31e468731a 100755 --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -335,15 +335,13 @@ ucidef_add_adsl_modem() { ucidef_add_vdsl_modem() { local annex="$1" - local firmware="$2" - local tone="$3" - local xfer_mode="$4" + local tone="$2" + local xfer_mode="$3" json_select_object dsl json_select_object modem json_add_string type "vdsl" json_add_string annex "$annex" - json_add_string firmware "$firmware" json_add_string tone "$tone" json_add_string xfer_mode "$xfer_mode" json_select .. diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network index 8ed525915d..b27b8026df 100755 --- a/target/linux/lantiq/base-files/etc/board.d/02_network +++ b/target/linux/lantiq/base-files/etc/board.d/02_network @@ -144,7 +144,7 @@ fi if grep -qE "system type.*: (VR9|xRX200)" /proc/cpuinfo; then interface_wan="ptm0" - ucidef_add_vdsl_modem "$annex" "/lib/firmware/vdsl.bin" "av" "ptm" + ucidef_add_vdsl_modem "$annex" "av" "ptm" else interface_wan="nas0" ucidef_add_adsl_modem "$annex" "/lib/firmware/adsl.bin" |