From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 6 May 2014 21:06:22 +0000 (+0000)
Subject: lantiq: support loading the dsl firmware from a flash partition as a raw gzipped... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6142d061b5548a7615cc3999183bb338025e9742;p=openwrt%2Fstaging%2Fadrian.git

lantiq: support loading the dsl firmware from a flash partition as a raw gzipped tarfile

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 40715
---

diff --git a/target/linux/lantiq/base-files/etc/init.d/dsl_fs b/target/linux/lantiq/base-files/etc/init.d/dsl_fs
index 975f5d8784..09c8a4afa2 100755
--- a/target/linux/lantiq/base-files/etc/init.d/dsl_fs
+++ b/target/linux/lantiq/base-files/etc/init.d/dsl_fs
@@ -4,10 +4,32 @@
 . /lib/functions.sh
 
 START=30
-start() {
+
+boot() {
 	MTD=$(find_mtd_index dsl_fw)
-	[ "$MTD" -gt 0 ] && {
-		mkdir -p /lib/firmware/dsl/
-		mount -t jffs2 /dev/mtdblock$MTD /lib/firmware/dsl/
-	}
+
+	grep /lib/firmware/lantiq /proc/mounts && umount /lib/firmware/lantiq
+
+	mkdir -p /lib/firmware/lantiq
+	[ "$MTD" -gt 0 ] || return 0
+
+	mount -t tmpfs none /lib/firmware/lantiq
+	case "$(dd if=/dev/mtd$MTD bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')" in
+		1985)
+			mkdir -p /tmp/fw_mnt
+			mount -t jffs2 /dev/mtdblock$MTD /tmp/fw_mnt
+			cp -a /tmp/fw_mnt/*.bin /lib/firmware/lantiq/
+			umount /tmp/fw_mnt
+			rmdir /tmp/fw_mnt
+		;;
+		1f8b)
+			tar xz -C /lib/firmware/lantiq < /dev/mtd$MTD
+		;;
+		*)
+			echo "No DSL firmware detected in /dev/mtd$MTD (dsl_fw)"
+			return 0
+		;;
+	esac
+
+	[ -e /lib/firmware/vdsl.bin ] || ln -s /lib/firmware/lantiq/vr9_dsl_fw_annex_b.bin /lib/firmware/vdsl.bin
 }