hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bcm53xx: sysupgrade: support flashing TRX with UBI image 

Signed-off-by: Dan Haab <dhaab@luxul.com>

SVN-Revision: 45542
owl
Rafał Miłecki 2015-04-21 08:20:06 +00:00
parent 92875dbd3d
commit d263c8e1a9
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
View File

@ -148,9 +148,6 @@ platform_pre_upgrade() {
local root_type=$(identify $dir/root) local root_type=$(identify $dir/root)
[ "$root_type" != "ubi" ] && return [ "$root_type" != "ubi" ] && return
echo "Provided firmware contains kernel and UBI image, but flashing it is unsupported yet"
exit 1
# Prepare TRX file with just a kernel that will replace current one # Prepare TRX file with just a kernel that will replace current one
local linux_length=$(grep "\"linux\"" /proc/mtd | sed "s/mtd[0-9]*:[ \t]*\([^ \t]*\).*/\1/") local linux_length=$(grep "\"linux\"" /proc/mtd | sed "s/mtd[0-9]*:[ \t]*\([^ \t]*\).*/\1/")
[ -z "$linux_length" ] && { [ -z "$linux_length" ] && {
@ -165,8 +162,17 @@ platform_pre_upgrade() {
-f $dir/kernel -b $linux_length \ -f $dir/kernel -b $linux_length \
-f /tmp/null.bin -f /tmp/null.bin
# Prepare UBI image (drop unwanted extra blocks)
local ubi_length=0
while [ "$(dd if=$dir/root skip=$ubi_length bs=1 count=4 2>/dev/null)" = "UBI#" ]; do
ubi_length=$(($ubi_length + 131072))
done
echo "ubi_length: $ubi_length"
dd if=$dir/root of=/tmp/root.ubi bs=131072 count=$((ubi_length / 131072)) 2>/dev/null
# Flash # Flash
mtd write /tmp/kernel.trx firmware mtd write /tmp/kernel.trx firmware
nand_do_upgrade /tmp/root.ubi
} }
platform_do_upgrade() { platform_do_upgrade() {