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=6a85d01df3a6d961e4954463b05c95463c463cc7;hp=846954cf1f482353424cbb97bf4dddae13f20f5e;hb=47ab1cbf23aef658f46bd86af88edb4e3f665639;hpb=79c04e18972ebe3acf2633852de33de51f9200bc

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 846954cf1f..6a85d01df3 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -70,6 +70,33 @@ 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"'
 }
@@ -167,6 +194,7 @@ platform_check_image() {
 	ap81 | \
 	ap83 | \
 	ap132 | \
+	dhp-1565-a1 |\
 	dir-505-a1 | \
 	dir-600-a1 | \
 	dir-615-c1 | \
@@ -190,6 +218,7 @@ platform_check_image() {
 	airgateway | \
 	airrouter | \
 	bullet-m | \
+	loco-m-xw | \
 	nanostation-m | \
 	rocket-m | \
 	nanostation-m-xw | \
@@ -199,6 +228,7 @@ platform_check_image() {
 	wzr-hp-g300nh | \
 	wzr-hp-g450h | \
 	wzr-hp-ag300h | \
+	wzr-450hp2 | \
 	whr-g301n | \
 	whr-hp-g300n | \
 	whr-hp-gn | \
@@ -214,6 +244,11 @@ platform_check_image() {
 		return 0
 		;;
 
+	cpe510)
+		tplink_pharos_check_image "$1" && return 0
+		return 1
+		;;
+
 	dir-825-b1 | \
 	tew-673gru)
 		dir825b_check_image "$1" && return 0
@@ -225,6 +260,7 @@ platform_check_image() {
 		return 1
 		;;
 
+	qihoo-c301 | \
 	mynet-n600 | \
 	mynet-n750)
 		[ "$magic_long" != "5ea3a417" ] && {
@@ -242,6 +278,8 @@ platform_check_image() {
 		;;
 	mr600 | \
 	mr600v2 | \
+	mr900 | \
+	mr900v2 | \
 	om2p | \
 	om2pv2 | \
 	om2p-hs | \
@@ -348,6 +386,7 @@ platform_check_image() {
 		return 0
 		;;
 	nbg6716 | \
+	r6100 | \
 	wndr3700v4 | \
 	wndr4300 )
 		nand_do_platform_check $board $1
@@ -382,6 +421,14 @@ platform_check_image() {
 		fi
 		return 0
 		;;
+    wnr2000-v4)
+		[ "$magic_long" != "32303034" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
+
 	esac
 
 	echo "Sysupgrade is not yet supported on $board."
@@ -424,6 +471,8 @@ platform_do_upgrade() {
 		;;
 	mr600 | \
 	mr600v2 | \
+	mr900 | \
+	mr900v2 | \
 	om2p | \
 	om2pv2 | \
 	om2p-hs | \