base-files: remove block2mtd checks from sysupgrade

[openwrt/staging/dedeckeh.git] / target / linux / octeon / base-files / lib / upgrade / platform.sh

diff --git a/target/linux/octeon/base-files/lib/upgrade/platform.sh b/target/linux/octeon/base-files/lib/upgrade/platform.sh
index 4d0047bceba79a6d813010a74c6e367a7c56a0d3..33a99312637740b0f9381510915f579df8da307d 100755 (executable)
--- a/target/linux/octeon/base-files/lib/upgrade/platform.sh
+++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh
@@ -7,10 +7,6 @@ platform_get_rootfs() {
 
        if read cmdline < /proc/cmdline; then
                case "$cmdline" in
-                       *block2mtd=*)
-                               rootfsdev="${cmdline##*block2mtd=}"
-                               rootfsdev="${rootfsdev%%,*}"
-                       ;;
                        *root=*)
                                rootfsdev="${cmdline##*root=}"
                                rootfsdev="${rootfsdev%% *}"
@@ -28,6 +24,11 @@ platform_copy_config() {
                cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
                umount /mnt
                ;;
+       itus,shield-router)
+               mount -t vfat /dev/mmcblk1p1 /mnt
+               cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
+               umount /mnt
+               ;;
        esac
 }
 
@@ -37,19 +38,34 @@ platform_do_flash() {
        local kernel=$3
        local rootfs=$4
 
+       local board_dir=$(tar tf "$tar_file" | grep -m 1 '^sysupgrade-.*/$')
+       board_dir=${board_dir%/}
+       [ -n "$board_dir" ] || return 1
+
        mkdir -p /boot
-       mount -t vfat /dev/$kernel /boot
 
-       [ -f /boot/vmlinux.64 -a ! -L /boot/vmlinux.64 ] && {
-               mv /boot/vmlinux.64 /boot/vmlinux.64.previous
-               mv /boot/vmlinux.64.md5 /boot/vmlinux.64.md5.previous
-       }
+       if [ $board = "itus,shield-router" ]; then
+               # mmcblk1p1 (fat) contains all ELF-bin images for the Shield
+               mount /dev/mmcblk1p1 /boot
+
+               echo "flashing Itus Kernel to /boot/$kernel (/dev/mmblk1p1)"
+               tar -Oxf $tar_file "$board_dir/kernel" > /boot/$kernel
+       else
+               mount -t vfat /dev/$kernel /boot
+
+               [ -f /boot/vmlinux.64 -a ! -L /boot/vmlinux.64 ] && {
+                       mv /boot/vmlinux.64 /boot/vmlinux.64.previous
+                       mv /boot/vmlinux.64.md5 /boot/vmlinux.64.md5.previous
+               }
+
+               echo "flashing kernel to /dev/$kernel"
+               tar xf $tar_file $board_dir/kernel -O > /boot/vmlinux.64
+               md5sum /boot/vmlinux.64 | cut -f1 -d " " > /boot/vmlinux.64.md5
+       fi
 
-       echo "flashing kernel to /dev/$kernel"
-       tar xf $tar_file sysupgrade-$board/kernel -O > /boot/vmlinux.64
-       md5sum /boot/vmlinux.64 | cut -f1 -d " " > /boot/vmlinux.64.md5
        echo "flashing rootfs to ${rootfs}"
-       tar xf $tar_file sysupgrade-$board/root -O | dd of="${rootfs}" bs=4096
+       tar xf $tar_file $board_dir/root -O | dd of="${rootfs}" bs=4096
+
        sync
        umount /boot
 }
@@ -68,6 +84,9 @@ platform_do_upgrade() {
        erlite)
                kernel=sda1
                ;;
+       itus,shield-router)
+               kernel=ItusrouterImage
+               ;;
        *)
                return 1
        esac
@@ -75,18 +94,22 @@ platform_do_upgrade() {
        platform_do_flash $tar_file $board $kernel $rootfs
 
        return 0
-       
 }
 
 platform_check_image() {
        local board=$(board_name)
+       local tar_file="$1"
+
+       local board_dir=$(tar tf "$tar_file" | grep -m 1 '^sysupgrade-.*/$')
+       board_dir=${board_dir%/}
+       [ -n "$board_dir" ] || return 1
 
        case "$board" in
        er | \
-       erlite)
-               local tar_file="$1"
-               local kernel_length=`(tar xf $tar_file sysupgrade-$board/kernel -O | wc -c) 2> /dev/null`
-               local rootfs_length=`(tar xf $tar_file sysupgrade-$board/root -O | wc -c) 2> /dev/null`
+       erlite | \
+       itus,shield-router)
+               local kernel_length=$(tar xf $tar_file $board_dir/kernel -O | wc -c 2> /dev/null)
+               local rootfs_length=$(tar xf $tar_file $board_dir/root -O | wc -c 2> /dev/null)
                [ "$kernel_length" = 0 -o "$rootfs_length" = 0 ] && {
                        echo "The upgrade image is corrupt."
                        return 1