X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=e6489a2b5802d9b2298edb7e9a89423e4cfdf7e8;hp=99ebe35b44f0b7ca924b580f6fa7a6d73346c8b3;hb=a5bd8de0bd80b83e43ce90ddc6623890344ad33d;hpb=6f008af3f0b30d2af21ad6934c17b0ae69103ecd

diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 99ebe35b44..e6489a2b58 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -16,11 +16,14 @@ platform_check_image() {
 	a5-v11|\
 	ai-br100|\
 	air3gii|\
+	alfa-network,ac1200rm|\
+	alfa-network,awusfree1|\
 	all0239-3g|\
 	all0256n-4M|\
 	all0256n-8M|\
 	all5002|\
 	all5003|\
+	mediatek,ap-mt7621a-v60|\
 	ar725w|\
 	asl26555-8M|\
 	asl26555-16M|\
@@ -60,6 +63,7 @@ platform_check_image() {
 	fonera20n|\
 	freestation5|\
 	gb-pc1|\
+	gnubee,gb-pc2|\
 	gl-mt300a|\
 	gl-mt300n|\
 	gl-mt750|\
@@ -81,7 +85,6 @@ platform_check_image() {
 	kn_rf|\
 	kng_rc|\
 	linkits7688|\
-	linkits7688d|\
 	m2m|\
 	m3|\
 	m4-4M|\
@@ -108,6 +111,7 @@ platform_check_image() {
 	nbg-419n|\
 	nbg-419n2|\
 	newifi-d1|\
+	d-team,newifi-d2|\
 	nixcore-x1-8M|\
 	nixcore-x1-16M|\
 	nw718|\
@@ -130,6 +134,7 @@ platform_check_image() {
 	rt-ac51u|\
 	rt-g32-b1|\
 	rt-n10-plus|\
+	rt-n12p|\
 	rt-n13u|\
 	rt-n14u|\
 	rt-n15|\
@@ -138,6 +143,7 @@ platform_check_image() {
 	sap-g3200u3|\
 	sk-wb8|\
 	sl-r7205|\
+	tama,w06|\
 	tew-638apb-v2|\
 	tew-691gr|\
 	tew-692gr|\
@@ -145,9 +151,12 @@ platform_check_image() {
 	timecloud|\
 	tiny-ac|\
 	u25awf-h1|\
+	u7621-06-256M-16M|\
+	u7628-01-128M-16M|\
 	ur-326n4g|\
 	ur-336un|\
 	v22rw-2x2|\
+	vonets,var11n-300|\
 	vocore-8M|\
 	vocore-16M|\
 	vocore2|\
@@ -162,7 +171,8 @@ platform_check_image() {
 	whr-300hp2|\
 	whr-600d|\
 	whr-g300n|\
-	widora-neo|\
+	widora,neo-16m|\
+	widora,neo-32m|\
 	witi|\
 	wizfi630a|\
 	wl-330n|\
@@ -198,8 +208,10 @@ platform_check_image() {
 	zbt-ape522ii|\
 	zbt-cpe102|\
 	zbt-wa05|\
+	zbtlink,zbt-we1226|\
 	zbt-we1326|\
 	zbt-we2026|\
+	zbtlink,zbt-we3526|\
 	zbt-we826-16M|\
 	zbt-we826-32M|\
 	zbt-wg2626|\
@@ -231,11 +243,15 @@ platform_check_image() {
 		}
 		return 0
 		;;
-	c20|\
 	c20i|\
 	c50|\
 	mr200|\
+	tplink,c20-v1|\
+	tplink,c20-v4|\
+	tplink,c50-v3|\
+	tplink,tl-mr3420-v5|\
 	tl-wr840n-v4|\
+	tl-wr840n-v5|\
 	tl-wr841n-v13)
 		[ "$magic" != "03000000" ] && {
 			echo "Invalid image type."
@@ -254,24 +270,28 @@ platform_check_image() {
 		}
 		return 0
 		;;
-	hc5962|\
-	mir3g|\
-	r6220)
-		# these boards use metadata images
-		return 0
-		;;
-	re350-v1)
-		[ "$magic" != "01000000" ] && {
+	dlink,dwr-116-a1)
+		[ "$magic" != "0404242b" ] && {
 			echo "Invalid image type."
 			return 1
 		}
 		return 0
 		;;
+	hc5962|\
+	mir3g|\
+	r6220|\
 	ubnt-erx|\
 	ubnt-erx-sfp)
 		nand_do_platform_check "$board" "$1"
 		return $?;
 		;;
+	re350-v1)
+		[ "$magic" != "01000000" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
 	wcr-1166ds|\
 	wsr-1166)
 		[ "$magic" != "48445230" ] && {
@@ -314,17 +334,8 @@ platform_do_upgrade() {
 	esac
 }
 
-disable_watchdog() {
-	killall watchdog
-	( ps | grep -v 'grep' | grep '/dev/watchdog' ) && {
-		echo 'Could not disable watchdog'
-		return 1
-	}
-}
-
 blink_led() {
 	. /etc/diag.sh; set_state upgrade
 }
 
-append sysupgrade_pre_upgrade disable_watchdog
 append sysupgrade_pre_upgrade blink_led