X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8c1109a28dbb93dc858530d0efc81033ce9193f4..f6ab961f67d76245bed7efdf1705f73b5f87a093:/target/linux/ar71xx/base-files/lib/upgrade/platform.sh?ds=sidebyside

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 38dbedbd4..d2780a50a 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -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")"
@@ -98,8 +102,11 @@ platform_check_image() {
 	nanostation-m | \
 	rocket-m | \
 	wzr-hp-g300nh | \
+	wzr-hp-g450h | \
 	wzr-hp-ag300h | \
+	whr-g301n | \
 	whr-hp-g300n | \
+	whr-hp-gn | \
 	nbg460n_550n_550nh | \
 	unifi )
 		[ "$magic" != "2705" ] && {
@@ -122,18 +129,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