aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-04-21 08:20:06 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-04-21 08:20:06 +0000
commit0cb38941b6e3e2d1dcff59376e00104f7a4480c0 (patch)
treecaea2c941609ef98aa5037fbaf13d80235012755
parentd28f70b2f8982cf9a396eb27ee685ae336a2e9fc (diff)
downloadupstream-0cb38941b6e3e2d1dcff59376e00104f7a4480c0.tar.gz
upstream-0cb38941b6e3e2d1dcff59376e00104f7a4480c0.tar.bz2
upstream-0cb38941b6e3e2d1dcff59376e00104f7a4480c0.zip
bcm53xx: sysupgrade: support flashing TRX with UBI image
Signed-off-by: Dan Haab <dhaab@luxul.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45542 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/bcm53xx/base-files/lib/upgrade/platform.sh12
1 files changed, 9 insertions, 3 deletions
diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index eb6906aaec..54a7815fed 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() {