bcm53xx: sysupgrade: allow flashing NAND devices without --force

[openwrt.git] / target / linux / bcm53xx / base-files / lib / upgrade / platform.sh

diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index eb6906a..d3440b7 100644 (file)
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -57,11 +57,6 @@ platform_identify() {
 platform_check_image() {
        [ "$#" -gt 1 ] && return 1
 
-       [ "$(platform_flash_type)" = "nand" ] && {
-               echo "Firmware upgrade on NAND devices is not implemented."
-               return 1
-       }
-
        local file_type=$(platform_identify "$1")
        local magic
        local error=0
@@ -148,9 +143,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 +157,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() {