ar71xx: rewrite WNDR3700/3800 handling

[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 f20264f..1de9077 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -69,21 +69,57 @@ platform_check_image() {
        [ "$ARGC" -gt 1 ] && return 1
 
        case "$board" in
        [ "$ARGC" -gt 1 ] && return 1
 
        case "$board" in

-       ap121 | ap121-mini | ap96 | db120 | zcn-1523h-2 | zcn-1523h-5)
+       all0258n )
+               platform_check_image_all0258n "$1" && return 0
+               return 1
+               ;;
+       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
                ;;
                [ "$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 )
+       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-g301n | \
+       whr-hp-g300n | \
+       whr-hp-gn | \
+       nbg460n_550n_550nh | \
+       unifi )

                [ "$magic" != "2705" ] && {
                        echo "Invalid image type."
                        return 1
                }
                return 0
                ;;
                [ "$magic" != "2705" ] && {
                        echo "Invalid image type."
                        return 1
                }
                return 0
                ;;

-       tl-mr3220 | tl-mr3420 | tl-wa901nd | tl-wa901nd-v2 | tl-wr703n | tl-wr741nd | tl-wr841n-v1 | tl-wr941nd | tl-wr1043nd)
+       tl-mr3220 | \
+       tl-mr3420 | \
+       tl-wa901nd | \
+       tl-wa901nd-v2 | \
+       tl-wr703n | \
+       tl-wr741nd | \
+       tl-wr741nd-v4 | \
+       tl-wr841n-v1 | \
+       tl-wr941nd | \
+       tl-wr1043nd)

                [ "$magic" != "0100" ] && {
                        echo "Invalid image type."
                        return 1
                [ "$magic" != "0100" ] && {
                        echo "Invalid image type."
                        return 1


@@ -91,15 +127,11 @@ platform_check_image() {
                return 0
                ;;
        wndr3700)
                return 0
                ;;
        wndr3700)

-               [ "$magic_long" != "33373030" ] && {
-                       echo "Invalid image type."
-                       return 1
-               }
-               return 0
-               ;;
-       wndr3700v2)
-               [ "$magic_long" != "33373031" ] && {
-                       echo "Invalid image type."
+               local hw_magic
+
+               hw_magic="$(ar71xx_get_mtd_part_magic firmware)"
+               [ "$magic_long" != "$hw_magic" ] && {
+                       echo "Invalid image, hardware ID mismatch, hw:$hw_magic image:$magic_long."

                        return 1
                }
                return 0
                        return 1
                }
                return 0


@@ -111,7 +143,13 @@ platform_check_image() {
                }
                return 0
                ;;
                }
                return 0
                ;;

-       routerstation | routerstation-pro | ls-sr71 | pb42 | pb44 | eap7660d | ja76pf )
+       routerstation | \
+       routerstation-pro | \
+       ls-sr71 | \
+       pb42 | \
+       pb44 | \
+       eap7660d | \
+       ja76pf )

                [ "$magic" != "4349" ] && {
                        echo "Invalid image. Use *-sysupgrade.bin files on this board"
                        return 1
                [ "$magic" != "4349" ] && {
                        echo "Invalid image. Use *-sysupgrade.bin files on this board"
                        return 1


@@ -138,9 +176,16 @@ platform_do_upgrade() {
        local board=$(ar71xx_board_name)
 
        case "$board" in
        local board=$(ar71xx_board_name)
 
        case "$board" in

-       routerstation | routerstation-pro | ls-sr71 | eap7660d | ja76pf )
+       routerstation | \
+       routerstation-pro | \
+       ls-sr71 | \
+       eap7660d | \
+       ja76pf)

                platform_do_upgrade_combined "$ARGV"
                ;;
                platform_do_upgrade_combined "$ARGV"
                ;;

+       all0258n )
+               platform_do_upgrade_all0258n "$ARGV"
+               ;;

        *)
                default_do_upgrade "$ARGV"
                ;;
        *)
                default_do_upgrade "$ARGV"
                ;;