diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-04-21 08:20:06 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-04-21 08:20:06 +0000 |
| commit | d263c8e1a964c075e25388d0d364c251c7337963 (patch) | |
| tree | a4eb314440fae69ad92348f82283d05a16eb53d8 | |
| parent | 92875dbd3d58403bcafac2b6623b29eb3bb41d87 (diff) | |
| download | upstream-d263c8e1a964c075e25388d0d364c251c7337963.tar.gz upstream-d263c8e1a964c075e25388d0d364c251c7337963.tar.bz2 upstream-d263c8e1a964c075e25388d0d364c251c7337963.zip | |
bcm53xx: sysupgrade: support flashing TRX with UBI image
Signed-off-by: Dan Haab <dhaab@luxul.com>
SVN-Revision: 45542
| -rw-r--r-- | target/linux/bcm53xx/base-files/lib/upgrade/platform.sh | 12 |
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() { |