mvebu: sysupgrade: drop unnecessary UBI to UBI logic

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

diff --git a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
index c5da471d76f1515da409c5e9c6db1e6dd91075b6..aaa32eb4ea787bc1dfbc662d368948104b474b41 100644 (file)
--- a/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/mvebu/cortexa9/base-files/lib/upgrade/linksys.sh
@@ -44,10 +44,6 @@ linksys_get_target_firmware() {
        esac
 }
 
-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")"
 
@@ -75,20 +71,7 @@ platform_do_upgrade_linksys() {
                nand_upgrade_tar "$1"
        }
        [ "$magic_long" = "27051956" -o "$magic_long" = "0000a0e1" ] && {
-               # 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
+               get_image "$1" | mtd write - $part_label
        }
 }