bcm53xx: sysupgrade: drop useless shift in platform.sh

[openwrt/staging/chunkeey.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 f5505219b0699b0ee22025d55c509b65cd72bb72..25d22d9528bd6709d98671f6fc79fc804bdc497f 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
@@ -79,7 +74,7 @@ platform_check_image() {
                                error=1
                        }
 
-                       if ! otrx -c "$1" -o "$header_len"; then
+                       if ! otrx check "$1" -o "$header_len"; then
                                echo "No valid TRX firmware in the CHK image"
                                error=1
                        fi
@@ -94,13 +89,13 @@ platform_check_image() {
                                error=1
                        }
 
-                       if ! otrx -c "$1" -o 32; then
+                       if ! otrx check "$1" -o 32; then
                                echo "No valid TRX firmware in the CyberTAN image"
                                error=1
                        fi
                ;;
                "trx")
-                       if ! otrx -c "$1"; then
+                       if ! otrx check "$1"; then
                                echo "Invalid (corrupted?) TRX firmware"
                                error=1
                        fi
@@ -114,57 +109,89 @@ platform_check_image() {
        return $error
 }
 
-platform_extract_trx_from_chk() {
-       local header_len=$((0x$(get_magic_long_at "$1" 4)))
-
-       dd if="$1" of="$2" bs=$header_len skip=1
-}
-
-platform_extract_trx_from_cybertan() {
-       dd if="$1" of="$2" bs=32 skip=1
-}
-
 platform_pre_upgrade() {
        local file_type=$(platform_identify "$1")
        local dir="/tmp/sysupgrade-bcm53xx"
        local trx="$1"
+       local offset
 
        [ "$(platform_flash_type)" != "nand" ] && return
 
-       # Extract trx
+       # Find trx offset
        case "$file_type" in
-               "chk")          trx="/tmp/$1.trx"; platform_extract_trx_from_chk "$1" "$trx";;
-               "cybertan")     trx="/tmp/$1.trx"; platform_extract_trx_from_cybertan "$1" "$trx";;
+               "chk")          offset=$((0x$(get_magic_long_at "$1" 4)));;
+               "cybertan")     offset=32;;
        esac
 
        # Extract partitions from trx
        rm -fR $dir
        mkdir -p $dir
-       otrx -e "$trx" \
+       otrx extract "$trx" \
+               ${offset:+-o $offset} \
                -1 $dir/kernel \
                -2 $dir/root
 
        # Firmwares without UBI image should be flashed "normally"
        local root_type=$(identify $dir/root)
-       [ "$root_type" != "ubi" ] && return
+       [ "$root_type" != "ubi" ] && {
+               echo "Provided firmware doesn't use UBI for rootfs."
+               return
+       }
+
+       # 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" ] && {
+               echo "Unable to find \"linux\" partition size"
+               exit 1
+       }
+       linux_length=$((0x$linux_length))
+       local kernel_length=$(wc -c $dir/kernel | cut -d ' ' -f 1)
+       [ $kernel_length -gt $linux_length ] && {
+               echo "New kernel doesn't fit \"linux\" partition."
+               return
+       }
+       rm -f /tmp/null.bin
+       rm -f /tmp/kernel.trx
+       touch /tmp/null.bin
+       otrx create /tmp/kernel.trx \
+               -f $dir/kernel -b $(($linux_length + 28)) \
+               -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
+       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_trx_from_chk_cmd() {
+       local header_len=$((0x$(get_magic_long_at "$1" 4)))
+
+       echo -n dd bs=$header_len skip=1
+}
 
-       echo "Provided firmware contains kernel and UBI image, but flashing it is unsupported yet"
-       exit 1
+platform_trx_from_cybertan_cmd() {
+       echo -n dd bs=32 skip=1
 }
 
 platform_do_upgrade() {
        local file_type=$(platform_identify "$1")
        local trx="$1"
+       local cmd=
 
        [ "$(platform_flash_type)" == "nand" ] && {
-               echo "Flashing firmware without UBI for rootfs. All erase counters will be lost."
+               echo "Writing whole image to NAND flash. All erase counters will be lost."
        }
 
        case "$file_type" in
-               "chk")          trx="/tmp/$1.trx"; platform_extract_trx_from_chk "$1" "$trx";;
-               "cybertan")     trx="/tmp/$1.trx"; platform_extract_trx_from_cybertan "$1" "$trx";;
+               "chk")          cmd=$(platform_trx_from_chk_cmd "$trx");;
+               "cybertan")     cmd=$(platform_trx_from_cybertan_cmd "$trx");;
        esac
 
-       shift
-       default_do_upgrade "$trx" "$@"
+       default_do_upgrade "$trx" "$cmd"
 }