From: Rafał Miłecki <zajec5@gmail.com>
Date: Tue, 21 Apr 2015 08:20:06 +0000 (+0000)
Subject: bcm53xx: sysupgrade: support flashing TRX with UBI image
X-Git-Tag: reboot~3200
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d263c8e1a964c075e25388d0d364c251c7337963;p=openwrt%2Fstaging%2Fblogic.git

bcm53xx: sysupgrade: support flashing TRX with UBI image

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

SVN-Revision: 45542
---

diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index eb6906aaec33..54a7815fedc5 100644
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -148,9 +148,6 @@ platform_pre_upgrade() {
 	local root_type=$(identify $dir/root)
 	[ "$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
 	local linux_length=$(grep "\"linux\"" /proc/mtd | sed "s/mtd[0-9]*:[ \t]*\([^ \t]*\).*/\1/")
 	[ -z "$linux_length" ] && {
@@ -165,8 +162,17 @@ platform_pre_upgrade() {
 		-f $dir/kernel -b $linux_length \
 		-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
 	mtd write /tmp/kernel.trx firmware
+	nand_do_upgrade /tmp/root.ubi
 }
 
 platform_do_upgrade() {