mvebu: add sysupgrade support for clearfog

[openwrt/openwrt.git] / target / linux / mvebu / base-files / lib / upgrade / linksys.sh

diff --git a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
index 8f5a89aaf681a6ad13c64ff573e039e7e908301b..baa29dc335fe93345f5733c93cb426f3abdbe880 100644 (file)
--- a/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/mvebu/base-files/lib/upgrade/linksys.sh
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org

 #
 
 linksys_get_target_firmware() {
 #
 
 linksys_get_target_firmware() {


@@ -19,9 +19,16 @@ linksys_get_target_firmware() {
                fw_setenv bootcmd "run nandboot"
        fi
 
                fw_setenv bootcmd "run nandboot"
        fi
 

+       # re-enable recovery so we get back if the new firmware is broken
+       fw_setenv auto_recovery yes
+

        echo "$target_firmware"
 }
 
        echo "$target_firmware"
 }
 

+linksys_get_root_magic() {
+       (get_image "$@" | dd skip=786432 bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null
+}
+

 platform_do_upgrade_linksys() {
        local magic_long="$(get_magic_long "$1")"
 
 platform_do_upgrade_linksys() {
        local magic_long="$(get_magic_long "$1")"
 


@@ -35,20 +42,50 @@ platform_do_upgrade_linksys() {
                exit 1
        fi
 
                exit 1
        fi
 

-       # we don't know, what filesystem does the other partition use,
-       # nuke it tobe safe
-       mtd erase $part_label
-       get_image "$1" | mtd -n write - $part_label
+       local target_mtd=$(find_mtd_part $part_label)
+
+       [ "$magic_long" = "73797375" ] && {
+               CI_KERNPART="$part_label"
+               if [ "$part_label" = "kernel1" ]
+               then
+                       CI_UBIPART="rootfs1"
+               else
+                       CI_UBIPART="rootfs2"
+               fi
+
+               nand_upgrade_tar "$1"
+       }
+       [ "$magic_long" = "27051956" ] && {
+               # check firmwares' rootfs types
+               local target_mtd=$(find_mtd_part $part_label)
+               local oldroot="$(linksys_get_root_magic $target_mtd)"
+               local newroot="$(linksys_get_root_magic "$1")"
+
+               if [ "$newroot" = "55424923" -a "$oldroot" = "55424923" ]
+               # we're upgrading from a firmware with UBI to one with UBI
+               then
+                       # erase everything to be safe
+                       mtd erase $part_label
+                       get_image "$1" | mtd -n write - $part_label
+               else
+                       get_image "$1" | mtd write - $part_label
+               fi
+       }

 }
 
 linksys_preupgrade() {
 }
 
 linksys_preupgrade() {

-       export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
-       export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
-       export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
+       local board=$(mvebu_board_name)

 
 

-       [ -f /tmp/sysupgrade.tgz ] && {
-               cp /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
-       }
+       case "$board" in
+       armada-385-linksys-caiman|armada-385-linksys-cobra|armada-385-linksys-shelby|armada-xp-linksys-mamba)
+               export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/sbin/fw_printenv /usr/sbin/fw_setenv"
+               export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /bin/mkdir /bin/touch"
+               export RAMFS_COPY_DATA="${RAMFS_COPY_DATA} /etc/fw_env.config /var/lock/fw_printenv.lock"
+
+               [ -f /tmp/sysupgrade.tgz ] && {
+                       cp /tmp/sysupgrade.tgz /tmp/syscfg/sysupgrade.tgz
+               }
+               ;;
+       esac

 }
 
 }
 

-append sysupgrade_pre_upgrade linksys_preupgrade