X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/03dd4c25f7457056eb620f725389896ac31e9988..2eb905f8ba355d71931c769d62bb491c8fcffc5e:/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 fd1136628..837846193 100755 --- 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 - vmlinux.bin.l7|kernel|linux|rootfs) + vmlinux.bin.l7|vmlinux|kernel|linux|rootfs) 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 - vmlinux.bin.l7|kernel|linux) + vmlinux.bin.l7|vmlinux|kernel|linux) echo "$part" break ;; @@ -61,6 +61,10 @@ platform_do_upgrade_combined() { 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")" @@ -77,6 +81,7 @@ platform_check_image() { ap121-mini | \ ap96 | \ db120 | \ + hornet-ub | \ zcn-1523h-2 | \ zcn-1523h-5) [ "$magic_long" != "68737173" -a "$magic_long" != "19852003" ] && { @@ -97,7 +102,9 @@ platform_check_image() { bullet-m | \ nanostation-m | \ rocket-m | \ + wzr-hp-g300nh2 | \ wzr-hp-g300nh | \ + wzr-hp-g450h | \ wzr-hp-ag300h | \ whr-g301n | \ whr-hp-g300n | \ @@ -124,18 +131,26 @@ platform_check_image() { 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 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 @@ -184,6 +199,8 @@ platform_do_upgrade() { routerstation-pro | \ ls-sr71 | \ eap7660d | \ + pb42 | \ + pb44 | \ ja76pf) platform_do_upgrade_combined "$ARGV" ;;