summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-03-07 11:03:18 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-03-07 11:03:18 +0000
commit4ac99abeb3c6301f921ad844bd70b9b53516cee4 (patch)
tree878878727f5a99dc7da803b359cf2462bc77cd43
parenta937e160c8f7d8ac11f615c1d0cd5eea1c049247 (diff)
downloadmtk-20170518-4ac99abeb3c6301f921ad844bd70b9b53516cee4.zip
mtk-20170518-4ac99abeb3c6301f921ad844bd70b9b53516cee4.tar.gz
mtk-20170518-4ac99abeb3c6301f921ad844bd70b9b53516cee4.tar.bz2
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> SVN-Revision: 48941
-rwxr-xr-xpackage/base-files/files/lib/functions/uci-defaults.sh6
-rwxr-xr-xtarget/linux/lantiq/base-files/etc/board.d/02_network2
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 512e0ed..31e4687 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 8ed5259..b27b802 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"