octeon: fix typo in platform.sh

[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 ad075d565291822408a243aabe626869692fe89f..fdfd6759bc315e1817fbb8754536feb033003e39 100755 (executable)
--- a/target/linux/octeon/base-files/lib/upgrade/platform.sh
+++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh
@@ -2,8 +2,6 @@
 # Copyright (C) 2014 OpenWrt.org
 #
 
-. /lib/functions/octeon.sh
-
 platform_get_rootfs() {
        local rootfsdev
 
@@ -24,9 +22,7 @@ platform_get_rootfs() {
 }
 
 platform_copy_config() {
-       local board="$(octeon_board_name)"
-
-       case "$board" in
+       case "$(board_name)" in
        erlite)
                mount -t vfat /dev/sda1 /mnt
                cp -af "$CONF_TAR" /mnt/
@@ -35,49 +31,64 @@ platform_copy_config() {
        esac
 }
 
+platform_do_flash() {
+       local tar_file=$1
+       local board=$2
+       local kernel=$3
+       local rootfs=$4
+
+       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
+       }
+
+       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
+       sync
+       umount /boot
+}
+
 platform_do_upgrade() {
-       local board=$(octeon_board_name)
+       local tar_file="$1"
+       local board=$(board_name)
        local rootfs="$(platform_get_rootfs)"
+       local kernel=
 
        [ -b "${rootfs}" ] || 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`
-
-               mkdir -p /boot
-               mount -t vfat /dev/sda1 /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
-               }
-
-               tar xf $tar_file sysupgrade-erlite/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 /boot
-               return 0
+               kernel=sda1
                ;;
+       er)
+               kernel=mmcblk0p1
+               ;;
+       *)
+               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)
 
        case "$board" in
-       erlite)
+       erlite | \
+       er)
                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 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`
                [ "$kernel_length" = 0 -o "$rootfs_length" = 0 ] && {
-                       echo "The upgarde image is corrupt."
+                       echo "The upgrade image is corrupt."
                        return 1
                }
                return 0