From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 7 Mar 2016 11:03:18 +0000 (+0000)
Subject: lantiq: do not set default firmware file
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4ac99abeb3c6301f921ad844bd70b9b53516cee4;p=openwrt%2Fstaging%2Faparcar.git

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
---

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"