octeon: add new target and support for Ubiquiti EdgeRouter 6P

[openwrt/openwrt.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 11399a2629ec09b8d11742c8261caf7f03696f85..255699bb31978725f1d213907b68bb535dee1ba6 100755 (executable)
--- a/target/linux/octeon/base-files/lib/upgrade/platform.sh
+++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh
@@ -2,17 +2,11 @@
 # Copyright (C) 2014 OpenWrt.org
 #
 
-. /lib/functions/octeon.sh
-
 platform_get_rootfs() {
        local rootfsdev
 
        if read cmdline < /proc/cmdline; then
                case "$cmdline" in
-                       *block2mtd=*)
-                               rootfsdev="${cmdline##*block2mtd=}"
-                               rootfsdev="${rootfsdev%%,*}"
-                       ;;
                        *root=*)
                                rootfsdev="${cmdline##*root=}"
                                rootfsdev="${rootfsdev%% *}"
@@ -23,48 +17,111 @@ platform_get_rootfs() {
        fi
 }
 
-platform_do_upgrade() {
-       local board=$(octeon_board_name)
-       local rootfs="$(platform_get_rootfs)"
+platform_copy_config() {
+       case "$(board_name)" in
+       erlite)
+               mount -t vfat /dev/sda1 /mnt
+               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
+               ;;
+       ubnt,edgerouter-4 | \
+       ubnt,edgerouter-6p)
+               mount -t vfat /dev/mmcblk0p1 /mnt
+               cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
+               umount /mnt
+               ;;
+       esac
+}
 
-       [ -d "${rootfs}" ] || return 1
+platform_do_flash() {
+       local tar_file=$1
+       local board=$2
+       local kernel=$3
+       local rootfs=$4
 
-       case "$board" in
-       erlite)
-               local tar_file="$1"
-               local kernel_length=`(tar xf $tar_file sysupgrade-erlite/kernel -O | wc -c) 2> /dev/null`
-               local rootfs_length=`(tar xf $tar_file sysupgrade-erlite/root -O | wc -c) 2> /dev/null`
+       local board_dir=$(tar tf "$tar_file" | grep -m 1 '^sysupgrade-.*/$')
+       board_dir=${board_dir%/}
+       [ -n "$board_dir" ] || return 1
+
+       mkdir -p /boot
+
+       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
                }
 
-               mkdir -p /boot
-               mount -t vfat /dev/sda1 /boot
-               tar xf $tar_file sysupgrade-erlite/kernel -O > /boot/vmlinux.64
+               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
-               tar xf $tar_file sysupgrade-erlite/root -O | dd of="${rootfs}" bs=4096
-               sync
-               umount /mnt
-               return 0
+       fi
+
+       echo "flashing rootfs to ${rootfs}"
+       tar xf $tar_file $board_dir/root -O | dd of="${rootfs}" bs=4096
+
+       sync
+       umount /boot
+}
+
+platform_do_upgrade() {
+       local tar_file="$1"
+       local board=$(board_name)
+       local rootfs="$(platform_get_rootfs)"
+       local kernel=
+
+       [ -b "${rootfs}" ] || return 1
+       case "$board" in
+       er | \
+       ubnt,edgerouter-4 | \
+       ubnt,edgerouter-6p)
+               kernel=mmcblk0p1
+               ;;
+       erlite)
+               kernel=sda1
+               ;;
+       itus,shield-router)
+               kernel=ItusrouterImage
                ;;
+       *)
+               return 1
        esac
 
-       return 1
-       
+       platform_do_flash $tar_file $board $kernel $rootfs
+
+       return 0
 }
 
 platform_check_image() {
-       local board=$(octeon_board_name)
+       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
-       erlite)
-               local tar_file="$1"
-               local kernel_length=`(tar xf $tar_file sysupgrade-erlite/kernel -O | wc -c) 2> /dev/null`
-               local rootfs_length=`(tar xf $tar_file sysupgrade-erlite/root -O | wc -c) 2> /dev/null`
+       er | \
+       erlite | \
+       itus,shield-router | \
+       ubnt,edgerouter-4 | \
+       ubnt,edgerouter-6p)
+               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 upgarde image is corrupt."
+                       echo "The upgrade image is corrupt."
                        return 1
                }
                return 0