[OpenWrt-Devel] [PATCH 1/2] lantiq: get rid of the dsl_fw mtd partition

[Andre Heider]

Now that we have redistributable vdsl/adsl firmware blobs in /lib/firmware,
we can drop the dsl_fw partition and extend the firmware partition.

Signed-off-by: Andre Heider <a.heider at gmail.com>
---

Tested with the annex b firmware on TDW8970.

 target/linux/lantiq/base-files/etc/init.d/dsl_fs | 35 ------------------------
 target/linux/lantiq/dts/ARV7519RW22.dts          |  7 +----
 target/linux/lantiq/dts/TDW89X0.dtsi             |  7 +----
 target/linux/lantiq/dts/VGV7510KW22NOR.dts       |  7 +----
 4 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100755 target/linux/lantiq/base-files/etc/init.d/dsl_fs

diff --git a/target/linux/lantiq/base-files/etc/init.d/dsl_fs b/target/linux/lantiq/base-files/etc/init.d/dsl_fs
deleted file mode 100755
index ccba4ae..0000000
--- a/target/linux/lantiq/base-files/etc/init.d/dsl_fs
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2014 OpenWrt.org
-
-. $IPKG_INSTROOT/lib/functions.sh
-
-START=30
-
-boot() {
-	MTD=$(find_mtd_index dsl_fw)
-
-	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
-}
diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts
index d925f86..471f347 100644
--- a/target/linux/lantiq/dts/ARV7519RW22.dts
+++ b/target/linux/lantiq/dts/ARV7519RW22.dts
@@ -36,12 +36,7 @@
 
 				partition at 80000 {
 					label = "firmware";
-					reg = <0x80000 0x1e00000>;
-				};
-
-				partition at 1e80000 {
-					label = "dsl_fw";
-					reg = <0x1e80000 0x100000>;
+					reg = <0x80000 0x1f00000>;
 				};
 
 				boardconfig: partition at 1f80000 {
diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi b/target/linux/lantiq/dts/TDW89X0.dtsi
index 084aa25..2dc194c 100644
--- a/target/linux/lantiq/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/dts/TDW89X0.dtsi
@@ -169,15 +169,10 @@
 			};
 
 			partition at 20000 {
-				reg = <0x20000 0x6a0000>;
+				reg = <0x20000 0x7a0000>;
 				label = "firmware";
 			};
 
-			partition at 6c0000 {
-				reg = <0x6c0000 0x100000>;
-				label = "dsl_fw";
-			};
-
 			partition at 7c0000 {
 				reg = <0x7c0000 0x10000>;
 				label = "config";
diff --git a/target/linux/lantiq/dts/VGV7510KW22NOR.dts b/target/linux/lantiq/dts/VGV7510KW22NOR.dts
index 57842bb..e2fcd1b 100644
--- a/target/linux/lantiq/dts/VGV7510KW22NOR.dts
+++ b/target/linux/lantiq/dts/VGV7510KW22NOR.dts
@@ -20,12 +20,7 @@
 
 				partition at 80000 {
 					label = "firmware";
-					reg = <0x80000 0xe60000>; /* 14720 KiB */
-				};
-
-				partition at 1e80000 {
-					label = "dsl_fw";
-					reg = <0xee0000 0x100000>;  /* 1024 KiB */
+					reg = <0x80000 0xf60000>; /* 15744 KiB */
 				};
 			};
 		};
-- 
2.6.2
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel