X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=c02e5e775e16135cda3705528754e125bb5540ef;hp=598b33e79e848993d8c34a46e1598b01c759c3ba;hb=42305ae24aa7ce95824d3b2303a40ab211f1a766;hpb=15f6f67d18bea6174d026d6af944f4553bcc3c98 diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 598b33e79e..c02e5e775e 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -66,10 +66,41 @@ 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"' } +tplink_pharos_check_image() { + local magic_long="$(get_magic_long "$1")" + [ "$magic_long" != "7f454c46" ] && { + echo "Invalid image magic '$magic_long'" + return 1 + } + + local model_string="$(tplink_pharos_get_model_string)" + local line + + # Here $1 is given to dd directly instead of get_image as otherwise the skip + # will take almost a second (as dd can't seek then) + # + # This will fail if the image isn't local, but that's fine: as the + # read loop won't be executed at all, it will return true, so the image + # is accepted (loading the first 1.5M of a remote image for this check seems + # a bit extreme) + dd if="$1" bs=1 skip=1511432 count=1024 2>/dev/null | while read line; do + [ "$line" == "$model_string" ] && break + done || { + echo "Unsupported image (model not in support-list)" + return 1 + } + + return 0 +} + seama_get_type_magic() { get_image "$@" | dd bs=1 count=4 skip=53 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' } @@ -140,22 +171,33 @@ platform_check_image() { case "$board" in all0315n | \ all0258n | \ - cap4200ag) + cap324 | \ + cap4200ag | \ + cr3000 |\ + cr5000) platform_check_image_allnet "$1" && return 0 return 1 ;; alfa-ap96 | \ alfa-nx | \ + arduino-yun | \ ap113 | \ ap121 | \ ap121-mini | \ ap136-010 | \ ap136-020 | \ ap135-020 | \ + ap147-010 | \ + ap152 | \ ap96 | \ + bxu2000n-2-a1 | \ db120 | \ + dr344 | \ + f9k1115v2 |\ hornet-ub | \ - bxu2000n-2-a1 | \ + mr12 | \ + mr16 | \ + wpj558 | \ zcn-1523h-2 | \ zcn-1523h-5) [ "$magic_long" != "68737173" -a "$magic_long" != "19852003" ] && { @@ -167,36 +209,58 @@ platform_check_image() { ap81 | \ ap83 | \ ap132 | \ + c-55 | \ + cf-e316n-v2 | \ + dgl-5500-a1 |\ dhp-1565-a1 |\ dir-505-a1 | \ dir-600-a1 | \ dir-615-c1 | \ dir-615-e1 | \ dir-615-e4 | \ + dir-615-i1 | \ dir-825-c1 | \ dir-835-a1 | \ + dlan-hotspot | \ + dlan-pro-500-wp | \ + dlan-pro-1200-ac | \ + dr531 | \ dragino2 | \ + epg5000 | \ esr1750 | \ esr900 | \ ew-dorin | \ ew-dorin-router | \ + gl-ar150 | \ + gl-mifi | \ + gl-ar300 | \ + gl-ar300m | \ + gl-domino | \ hiwifi-hc6361 | \ hornet-ub-x2 | \ + jwap230 | \ mzk-w04nu | \ mzk-w300nh | \ tew-632brp | \ tew-712br | \ tew-732br | \ + tew-823dru | \ wrt400n | \ airgateway | \ + airgatewaypro | \ airrouter | \ bullet-m | \ loco-m-xw | \ nanostation-m | \ rocket-m | \ + rocket-m-xw | \ + rocket-m-ti | \ nanostation-m-xw | \ rw2458n | \ + wpj531 | \ wndap360 | \ + wpj342 | \ + wpj344 | \ wzr-hp-g300nh2 | \ wzr-hp-g300nh | \ wzr-hp-g450h | \ @@ -208,8 +272,12 @@ platform_check_image() { wlae-ag300n | \ nbg460n_550n_550nh | \ unifi | \ + unifiac-lite | \ + unifiac-pro | \ unifi-outdoor | \ - carambola2 ) + carambola2 | \ + weio | \ + wrtnode2q) [ "$magic" != "2705" ] && { echo "Invalid image type." return 1 @@ -217,6 +285,13 @@ platform_check_image() { return 0 ;; + cpe210|\ + cpe510) + tplink_pharos_check_image "$1" && return 0 + return 1 + ;; + + bsb | \ dir-825-b1 | \ tew-673gru) dir825b_check_image "$1" && return 0 @@ -244,6 +319,8 @@ platform_check_image() { return 0; ;; + mr1750 | \ + mr1750v2 | \ mr600 | \ mr600v2 | \ mr900 | \ @@ -252,21 +329,36 @@ platform_check_image() { om2pv2 | \ om2p-hs | \ om2p-hsv2 | \ + om2p-hsv3 | \ om2p-lc | \ - om5p) + om5p | \ + om5p-an | \ + om5p-ac | \ + om5p-acv2) platform_check_image_openmesh "$magic_long" "$1" && return 0 return 1 ;; + antminer-s1 | \ + antminer-s3 | \ + antrouter-r1 | \ archer-c5 | \ archer-c7 | \ el-m150 | \ el-mini | \ gl-inet | \ + mc-mac1200r | \ + minibox-v1 |\ + omy-g1 |\ + omy-x1 |\ + onion-omega | \ oolite | \ smart-300 | \ + som9331 | \ + tellstick-znet-lite | \ tl-mr10u | \ tl-mr11u | \ + tl-mr12u | \ tl-mr13u | \ tl-mr3020 | \ tl-mr3040 | \ @@ -275,6 +367,8 @@ platform_check_image() { tl-mr3220-v2 | \ tl-mr3420 | \ tl-mr3420-v2 | \ + tl-wa701nd-v2 | \ + tl-wa7210n-v2 | \ tl-wa7510n | \ tl-wa750re | \ tl-wa850re | \ @@ -283,38 +377,58 @@ platform_check_image() { tl-wa901nd | \ tl-wa901nd-v2 | \ tl-wa901nd-v3 | \ + tl-wa901nd-v4 | \ + tl-wdr3320-v2 | \ tl-wdr3500 | \ tl-wdr4300 | \ tl-wdr4900-v2 | \ + tl-wdr6500-v2 | \ tl-wr703n | \ tl-wr710n | \ tl-wr720n-v3 | \ tl-wr741nd | \ tl-wr741nd-v4 | \ + tl-wr810n | \ tl-wr841n-v1 | \ tl-wa830re-v2 | \ tl-wr841n-v7 | \ tl-wr841n-v8 | \ tl-wr841n-v9 | \ + tl-wr841n-v11 | \ tl-wr842n-v2 | \ + tl-wr842n-v3 | \ tl-wr941nd | \ + tl-wr941nd-v5 | \ + tl-wr941nd-v6 | \ tl-wr1041n-v2 | \ tl-wr1043nd | \ tl-wr1043nd-v2 | \ tl-wr2543n) - [ "$magic" != "0100" ] && { + local magic_ver="0100" + + case "$board" in + tl-wdr6500-v2) + magic_ver="0200" + ;; + esac + + [ "$magic" != "$magic_ver" ] && { echo "Invalid image type." return 1 } 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 } @@ -334,6 +448,8 @@ platform_check_image() { return 1 ;; + nbg6616 | \ + unifi-outdoor-plus | \ uap-pro) [ "$magic_long" != "19852003" ] && { echo "Invalid image type." @@ -343,7 +459,9 @@ platform_check_image() { ;; wndr3700 | \ wnr2000-v3 | \ - wnr612-v2) + wnr612-v2 | \ + wnr1000-v2 | \ + wpn824n) local hw_magic hw_magic="$(ar71xx_get_mtd_part_magic firmware)" @@ -353,6 +471,10 @@ platform_check_image() { } return 0 ;; + mr18) + merakinand_do_platform_check $board $1 + return $?; + ;; nbg6716 | \ r6100 | \ wndr3700v4 | \ @@ -389,13 +511,20 @@ platform_check_image() { fi return 0 ;; - wnr2000-v4) + wnr2000-v4) [ "$magic_long" != "32303034" ] && { echo "Invalid image type." return 1 } return 0 ;; + wnr2200) + [ "$magic_long" != "32323030" ] && { + echo "Invalid image type." + return 1 + } + return 0 + ;; esac @@ -403,6 +532,22 @@ platform_check_image() { return 1 } +platform_pre_upgrade() { + local board=$(ar71xx_board_name) + + case "$board" in + nbg6716 | \ + r6100 | \ + wndr3700v4 | \ + wndr4300 ) + nand_do_upgrade "$1" + ;; + mr18) + merakinand_do_upgrade "$1" + ;; + esac +} + platform_do_upgrade() { local board=$(ar71xx_board_name) @@ -437,6 +582,8 @@ platform_do_upgrade() { tew-673gru) platform_do_upgrade_dir825b "$ARGV" ;; + mr1750 | \ + mr1750v2 | \ mr600 | \ mr600v2 | \ mr900 | \ @@ -445,10 +592,15 @@ platform_do_upgrade() { om2pv2 | \ om2p-hs | \ om2p-hsv2 | \ + om2p-hsv3 | \ om2p-lc | \ - om5p) + om5p | \ + om5p-an | \ + om5p-ac | \ + om5p-acv2) platform_do_upgrade_openmesh "$ARGV" ;; + unifi-outdoor-plus | \ uap-pro) MTD_CONFIG_ARGS="-s 0x180000" default_do_upgrade "$ARGV"