lantiq: get rid of the dsl_fw mtd partition
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@gmail.com> SVN-Revision: 47783
This commit is contained in:
parent
cbb1227c4c
commit
e82404ce6c
|
@ -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
|
||||
}
|
|
@ -36,12 +36,7 @@
|
|||
|
||||
partition@80000 {
|
||||
label = "firmware";
|
||||
reg = <0x80000 0x1e00000>;
|
||||
};
|
||||
|
||||
partition@1e80000 {
|
||||
label = "dsl_fw";
|
||||
reg = <0x1e80000 0x100000>;
|
||||
reg = <0x80000 0x1f00000>;
|
||||
};
|
||||
|
||||
boardconfig: partition@1f80000 {
|
||||
|
|
|
@ -30,15 +30,10 @@
|
|||
};
|
||||
|
||||
partition@20000 {
|
||||
reg = <0x20000 0x6a0000>;
|
||||
reg = <0x20000 0x7a0000>;
|
||||
label = "firmware";
|
||||
};
|
||||
|
||||
partition@6c0000 {
|
||||
reg = <0x6c0000 0x100000>;
|
||||
label = "dsl_fw";
|
||||
};
|
||||
|
||||
partition@7c0000 {
|
||||
reg = <0x7c0000 0x10000>;
|
||||
label = "config";
|
||||
|
|
|
@ -20,12 +20,7 @@
|
|||
|
||||
partition@80000 {
|
||||
label = "firmware";
|
||||
reg = <0x80000 0xe60000>; /* 14720 KiB */
|
||||
};
|
||||
|
||||
partition@1e80000 {
|
||||
label = "dsl_fw";
|
||||
reg = <0xee0000 0x100000>; /* 1024 KiB */
|
||||
reg = <0x80000 0xf60000>; /* 15744 KiB */
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue