ar71xx: add model detection for TL-WR842N/ND

[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 38dbedb..91b04c5 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -15,7 +15,7 @@ platform_find_partitions() {
        while read dev size erasesize name; do
                name=${name#'"'}; name=${name%'"'}
                case "$name" in
        while read dev size erasesize name; do
                name=${name#'"'}; name=${name%'"'}
                case "$name" in

-                       vmlinux.bin.l7|kernel|linux|rootfs)
+                       vmlinux.bin.l7|vmlinux|kernel|linux|rootfs)

                                if [ -z "$first" ]; then
                                        first="$name"
                                else
                                if [ -z "$first" ]; then
                                        first="$name"
                                else


@@ -31,7 +31,7 @@ platform_find_kernelpart() {
        local part
        for part in "${1%:*}" "${1#*:}"; do
                case "$part" in
        local part
        for part in "${1%:*}" "${1#*:}"; do
                case "$part" in

-                       vmlinux.bin.l7|kernel|linux)
+                       vmlinux.bin.l7|vmlinux|kernel|linux)

                                echo "$part"
                                break
                        ;;
                                echo "$part"
                                break
                        ;;


@@ -61,6 +61,10 @@ platform_do_upgrade_combined() {
        fi
 }
 
        fi
 }
 

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

 platform_check_image() {
        local board=$(ar71xx_board_name)
        local magic="$(get_magic_word "$1")"
 platform_check_image() {
        local board=$(ar71xx_board_name)
        local magic="$(get_magic_word "$1")"


@@ -73,10 +77,14 @@ platform_check_image() {
                platform_check_image_all0258n "$1" && return 0
                return 1
                ;;
                platform_check_image_all0258n "$1" && return 0
                return 1
                ;;

+       alfa-ap96 | \
+       alfa-nx | \
+       ap113 | \

        ap121 | \
        ap121-mini | \
        ap96 | \
        db120 | \
        ap121 | \
        ap121-mini | \
        ap96 | \
        db120 | \

+       hornet-ub | \

        zcn-1523h-2 | \
        zcn-1523h-5)
                [ "$magic_long" != "68737173" -a "$magic_long" != "19852003" ] && {
        zcn-1523h-2 | \
        zcn-1523h-5)
                [ "$magic_long" != "68737173" -a "$magic_long" != "19852003" ] && {


@@ -89,17 +97,25 @@ platform_check_image() {
        ap83 | \
        dir-600-a1 | \
        dir-615-c1 | \
        ap83 | \
        dir-600-a1 | \
        dir-615-c1 | \

+       dir-615-e4 | \

        dir-825-b1 | \
        mzk-w04nu | \
        mzk-w300nh | \
        tew-632brp | \
        dir-825-b1 | \
        mzk-w04nu | \
        mzk-w300nh | \
        tew-632brp | \

+       tew-673gru | \

        wrt400n | \
        wrt400n | \

+       airrouter | \

        bullet-m | \
        nanostation-m | \
        rocket-m | \
        bullet-m | \
        nanostation-m | \
        rocket-m | \

+       rw2458n | \
+       wzr-hp-g300nh2 | \

        wzr-hp-g300nh | \
        wzr-hp-g300nh | \

+       wzr-hp-g450h | \

        wzr-hp-ag300h | \
        wzr-hp-ag300h | \

+       whr-g301n | \

        whr-hp-g300n | \
        whr-hp-g300n | \

+       whr-hp-gn | \

        nbg460n_550n_550nh | \
        unifi )
                [ "$magic" != "2705" ] && {
        nbg460n_550n_550nh | \
        unifi )
                [ "$magic" != "2705" ] && {


@@ -108,6 +124,8 @@ platform_check_image() {
                }
                return 0
                ;;
                }
                return 0
                ;;

+       tl-mr11u | \
+       tl-mr3020 | \

        tl-mr3220 | \
        tl-mr3420 | \
        tl-wa901nd | \
        tl-mr3220 | \
        tl-mr3420 | \
        tl-wa901nd | \


@@ -116,24 +134,34 @@ platform_check_image() {
        tl-wr741nd | \
        tl-wr741nd-v4 | \
        tl-wr841n-v1 | \
        tl-wr741nd | \
        tl-wr741nd-v4 | \
        tl-wr841n-v1 | \

+       tl-wr841n-v7 | \

        tl-wr941nd | \
        tl-wr941nd | \

-       tl-wr1043nd)
+       tl-wr1043nd | \
+       tl-wr2543n)

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

-               return 0
-               ;;
-       wndr3700)
-               [ "$magic_long" != "33373030" ] && {
-                       echo "Invalid image type."
+
+               local hwid
+               local imageid
+
+               hwid=$(tplink_get_hwid)
+               imageid=$(tplink_get_image_hwid "$1")
+
+               [ "$hwid" != "$imageid" ] && {
+                       echo "Invalid image, hardware ID mismatch, hw:$hwid image:$imageid."

                        return 1
                }
                        return 1
                }

+

                return 0
                ;;
                return 0
                ;;

-       wndr3700v2)
-               [ "$magic_long" != "33373031" ] && {
-                       echo "Invalid image type."
+       wndr3700)
+               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


@@ -182,6 +210,8 @@ platform_do_upgrade() {
        routerstation-pro | \
        ls-sr71 | \
        eap7660d | \
        routerstation-pro | \
        ls-sr71 | \
        eap7660d | \

+       pb42 | \
+       pb44 | \

        ja76pf)
                platform_do_upgrade_combined "$ARGV"
                ;;
        ja76pf)
                platform_do_upgrade_combined "$ARGV"
                ;;