rpcd: iwinfo plugin fixes

[openwrt/svn-archive/archive.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 e662524df5532c771b8a35c85debb67baf1c1e80..9f8a14b2bcfb41a193755ae792627fe58ddb6b93 100755 (executable)
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -66,6 +66,10 @@ tplink_get_image_hwid() {
        get_image "$@" | dd bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
 }
 
+tplink_get_image_mid() {
+       get_image "$@" | dd bs=4 count=1 skip=17 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
 tplink_get_image_boot_size() {
        get_image "$@" | dd bs=4 count=1 skip=37 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
 }
@@ -184,6 +188,7 @@ platform_check_image() {
        ap136-020 | \
        ap135-020 | \
        ap147-010 | \
+       ap152 | \
        ap96 | \
        bxu2000n-2-a1 | \
        db120 | \
@@ -250,6 +255,7 @@ platform_check_image() {
        rw2458n | \
        wpj531 | \
        wndap360 | \
+       wpj342 | \
        wpj344 | \
        wzr-hp-g300nh2 | \
        wzr-hp-g300nh | \
@@ -262,6 +268,7 @@ platform_check_image() {
        wlae-ag300n | \
        nbg460n_550n_550nh | \
        unifi | \
+       unifiac | \
        unifi-outdoor | \
        carambola2 | \
        weio )
@@ -316,7 +323,9 @@ platform_check_image() {
        om2p-hsv2 | \
        om2p-lc | \
        om5p | \
-       om5p-an)
+       om5p-an | \
+       om5p-ac | \
+       om5p-acv2)
                platform_check_image_openmesh "$magic_long" "$1" && return 0
                return 1
                ;;
@@ -331,9 +340,12 @@ platform_check_image() {
        gl-inet | \
        mc-mac1200r | \
        minibox-v1 |\
+       omy-g1 |\
+       omy-x1 |\
        onion-omega | \
        oolite | \
        smart-300 | \
+       tellstick-znet-lite | \
        tl-mr10u | \
        tl-mr11u | \
        tl-mr12u | \
@@ -355,6 +367,7 @@ platform_check_image() {
        tl-wa901nd | \
        tl-wa901nd-v2 | \
        tl-wa901nd-v3 | \
+       tl-wa901nd-v4 | \
        tl-wdr3320-v2 | \
        tl-wdr3500 | \
        tl-wdr4300 | \
@@ -365,6 +378,7 @@ platform_check_image() {
        tl-wr720n-v3 | \
        tl-wr741nd | \
        tl-wr741nd-v4 | \
+       tl-wr810n | \
        tl-wr841n-v1 | \
        tl-wa830re-v2 | \
        tl-wr841n-v7 | \
@@ -392,13 +406,17 @@ platform_check_image() {
                }
 
                local hwid
-               local imageid
+               local mid
+               local imagehwid
+               local imagemid
 
                hwid=$(tplink_get_hwid)
-               imageid=$(tplink_get_image_hwid "$1")
+               mid=$(tplink_get_mid)
+               imagehwid=$(tplink_get_image_hwid "$1")
+               imagemid=$(tplink_get_image_mid "$1")
 
-               [ "$hwid" != "$imageid" ] && {
-                       echo "Invalid image, hardware ID mismatch, hw:$hwid image:$imageid."
+               [ "$hwid" != "$imagehwid" -o "$mid" != "$imagemid" ] && {
+                       echo "Invalid image, hardware ID mismatch, hw:$hwid $mid image:$imagehwid $imagemid."
                        return 1
                }
 
@@ -430,7 +448,8 @@ platform_check_image() {
        wndr3700 | \
        wnr2000-v3 | \
        wnr612-v2 | \
-       wnr1000-v2)
+       wnr1000-v2 | \
+       wpn824n)
                local hw_magic
 
                hw_magic="$(ar71xx_get_mtd_part_magic firmware)"
@@ -562,7 +581,9 @@ platform_do_upgrade() {
        om2p-hsv2 | \
        om2p-lc | \
        om5p | \
-       om5p-an)
+       om5p-an | \
+       om5p-ac | \
+       om5p-acv2)
                platform_do_upgrade_openmesh "$ARGV"
                ;;
        unifi-outdoor-plus | \