ar71xx/sysupgrade: use $magic_long instead of $magic when comparing with a 32-bit...

[openwrt.git] / target / linux / ar71xx / base-files / lib / upgrade / platform.sh

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index e320f30..f20264f 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2011 OpenWrt.org
 #
 
 . /lib/ar71xx.sh
@@ -64,18 +64,26 @@ platform_do_upgrade_combined() {
 platform_check_image() {
        local board=$(ar71xx_board_name)
        local magic="$(get_magic_word "$1")"
+       local magic_long="$(get_magic_long "$1")"
 
        [ "$ARGC" -gt 1 ] && return 1
 
        case "$board" in
-       ap83 | dir-615-c1 | dir-825-b1 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt-400n | bullet-m | nano-m | rocket-m)
+       ap121 | ap121-mini | ap96 | db120 | zcn-1523h-2 | zcn-1523h-5)
+               [ "$magic_long" != "68737173" -a "$magic_long" != "19852003" ] && {
+                       echo "Invalid image type."
+                       return 1
+               }
+               return 0
+               ;;
+       ap81 | ap83 | dir-600-a1 | dir-615-c1 | dir-825-b1 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt400n | bullet-m | nanostation-m | rocket-m | wzr-hp-g300nh | wzr-hp-ag300h | whr-hp-g300n | nbg460n_550n_550nh | unifi )
                [ "$magic" != "2705" ] && {
                        echo "Invalid image type."
                        return 1
                }
                return 0
                ;;
-       tl-wr741nd | tl-wr841n-v1 | tl-wr941nd | tl-wr1043nd)
+       tl-mr3220 | tl-mr3420 | tl-wa901nd | tl-wa901nd-v2 | tl-wr703n | tl-wr741nd | tl-wr841n-v1 | tl-wr941nd | tl-wr1043nd)
                [ "$magic" != "0100" ] && {
                        echo "Invalid image type."
                        return 1
@@ -83,7 +91,14 @@ platform_check_image() {
                return 0
                ;;
        wndr3700)
-               [ "$magic" != "3337" ] && {
+               [ "$magic_long" != "33373030" ] && {
+                       echo "Invalid image type."
+                       return 1
+               }
+               return 0
+               ;;
+       wndr3700v2)
+               [ "$magic_long" != "33373031" ] && {
                        echo "Invalid image type."
                        return 1
                }
@@ -96,7 +111,7 @@ platform_check_image() {
                }
                return 0
                ;;
-       routerstation | routerstation-pro | ls-sr71)
+       routerstation | routerstation-pro | ls-sr71 | pb42 | pb44 | eap7660d | ja76pf )
                [ "$magic" != "4349" ] && {
                        echo "Invalid image. Use *-sysupgrade.bin files on this board"
                        return 1
@@ -123,7 +138,7 @@ platform_do_upgrade() {
        local board=$(ar71xx_board_name)
 
        case "$board" in
-       routerstation | routerstation-pro)
+       routerstation | routerstation-pro | ls-sr71 | eap7660d | ja76pf )
                platform_do_upgrade_combined "$ARGV"
                ;;
        *)