X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=67c032cb8a9dcfbe8044764235949d5646aabfe1;hb=37af596593b0e84d0a076ab8f173066e3d7bc810;hp=0d5b6bb4fcc8884a939e287030e8f697f34fc493;hpb=9996480b0ee80456af0b9fc3d44580393b09c84b;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 0d5b6bb4fc..67c032cb8a 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|\
@@ -28,6 +31,7 @@ platform_check_image() {
 	awm002-evb-4M|\
 	awm002-evb-8M|\
 	bc2|\
+	bocco|\
 	broadway|\
 	c108|\
 	carambola|\
@@ -49,8 +53,9 @@ platform_check_image() {
 	dir-620-d1|\
 	dir-810l|\
 	duzun-dm06|\
-	dwr-512-b|\
 	e1700|\
+	elecom,wrc-1167ghbk2-s|\
+	elecom,wrc-2533gst|\
 	esr-9753|\
 	ew1200|\
 	ex2700|\
@@ -59,7 +64,8 @@ platform_check_image() {
 	firewrt|\
 	fonera20n|\
 	freestation5|\
-	gb-pc1|\
+	gnubee,gb-pc1|\
+	gnubee,gb-pc2|\
 	gl-mt300a|\
 	gl-mt300n|\
 	gl-mt750|\
@@ -67,21 +73,24 @@ platform_check_image() {
 	hc5*61|\
 	hc5661a|\
 	hg255d|\
+	hiwifi,hc5861b|\
 	hlk-rm04|\
 	hpm|\
 	ht-tm02|\
 	hw550-3g|\
+	iodata,wn-ax1167gr|\
+	iodata,wn-gx300gr|\
 	ip2202|\
 	jhr-n805r|\
 	jhr-n825r|\
 	jhr-n926r|\
 	k2p|\
+	kimax,u35wf|\
 	kn|\
 	kn_rc|\
 	kn_rf|\
 	kng_rc|\
 	linkits7688|\
-	linkits7688d|\
 	m2m|\
 	m3|\
 	m4-4M|\
@@ -108,6 +117,7 @@ platform_check_image() {
 	nbg-419n|\
 	nbg-419n2|\
 	newifi-d1|\
+	d-team,newifi-d2|\
 	nixcore-x1-8M|\
 	nixcore-x1-16M|\
 	nw718|\
@@ -116,12 +126,14 @@ platform_check_image() {
 	oy-0001|\
 	pbr-d1|\
 	pbr-m1|\
+	phicomm,k2g|\
 	psg1208|\
 	psg1218a|\
 	psg1218b|\
 	psr-680w|\
 	px-4885-4M|\
 	px-4885-8M|\
+	netgear,r6120|\
 	rb750gr3|\
 	re6500|\
 	rp-n53|\
@@ -130,6 +142,7 @@ platform_check_image() {
 	rt-ac51u|\
 	rt-g32-b1|\
 	rt-n10-plus|\
+	rt-n12p|\
 	rt-n13u|\
 	rt-n14u|\
 	rt-n15|\
@@ -138,6 +151,7 @@ platform_check_image() {
 	sap-g3200u3|\
 	sk-wb8|\
 	sl-r7205|\
+	tama,w06|\
 	tew-638apb-v2|\
 	tew-691gr|\
 	tew-692gr|\
@@ -150,6 +164,7 @@ platform_check_image() {
 	ur-326n4g|\
 	ur-336un|\
 	v22rw-2x2|\
+	vonets,var11n-300|\
 	vocore-8M|\
 	vocore-16M|\
 	vocore2|\
@@ -159,13 +174,16 @@ platform_check_image() {
 	w2914nsv2|\
 	w306r-v20|\
 	w502u|\
+	ravpower,wd03|\
 	wf-2881|\
 	whr-1166d|\
 	whr-300hp2|\
 	whr-600d|\
 	whr-g300n|\
-	widora-neo|\
-	witi|\
+	widora,neo-16m|\
+	widora,neo-32m|\
+	mqmaker,witi-256m|\
+	mqmaker,witi-512m|\
 	wizfi630a|\
 	wl-330n|\
 	wl-330n3g|\
@@ -196,20 +214,24 @@ platform_check_image() {
 	x8|\
 	y1|\
 	y1s|\
+	youhua,wr1200js|\
 	we1026-5g-16m|\
 	zbt-ape522ii|\
 	zbt-cpe102|\
 	zbt-wa05|\
+	zbtlink,zbt-we1226|\
 	zbt-we1326|\
 	zbt-we2026|\
-	zbt-we3526|\
+	zbtlink,zbt-we3526|\
 	zbt-we826-16M|\
 	zbt-we826-32M|\
 	zbt-wg2626|\
 	zbt-wg3526-16M|\
 	zbt-wg3526-32M|\
 	zbt-wr8305rt|\
+	zorlik,zl5900v2|\
 	zte-q7|\
+	zyxel,keenetic-extra-ii|\
 	youku-yk1)
 		[ "$magic" != "27051956" ] && {
 			echo "Invalid image type."
@@ -219,7 +241,8 @@ platform_check_image() {
 		;;
 	3g-6200n|\
 	3g-6200nl|\
-	br-6475nd)
+	br-6475nd|\
+	edimax,br-6478ac-v2)
 		[ "$magic" != "43535953" ] && {
 			echo "Invalid image type."
 			return 1
@@ -234,10 +257,17 @@ platform_check_image() {
 		}
 		return 0
 		;;
-	c20|\
 	c20i|\
 	c50|\
 	mr200|\
+	tplink,c2-v1|\
+	tplink,c20-v1|\
+	tplink,c20-v4|\
+	tplink,c50-v3|\
+	tplink,tl-mr3420-v5|\
+	tplink,tl-wa801nd-v5|\
+	tplink,tl-wr842n-v5|\
+	tplink,tl-wr902ac-v3|\
 	tl-wr840n-v4|\
 	tl-wr840n-v5|\
 	tl-wr841n-v13)
@@ -258,24 +288,33 @@ platform_check_image() {
 		}
 		return 0
 		;;
-	hc5962|\
-	mir3g|\
-	r6220)
-		# these boards use metadata images
-		return 0
-		;;
-	re350-v1)
-		[ "$magic" != "01000000" ] && {
+	dlink,dwr-116-a1|\
+	dlink,dwr-118-a2|\
+	dlink,dwr-921-c1|\
+	dwr-512-b)
+		[ "$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 $?;
 		;;
+	mikrotik,rbm11g|\
+	mikrotik,rbm33g|\
+	re350-v1)
+		[ "$magic" != "01000000" ] && {
+			echo "Invalid image type."
+			return 1
+		}
+		return 0
+		;;
 	wcr-1166ds|\
 	wsr-1166)
 		[ "$magic" != "48445230" ] && {
@@ -290,6 +329,17 @@ platform_check_image() {
 	return 1
 }
 
+platform_pre_upgrade() {
+	local board=$(board_name)
+
+	case "$board" in
+	mikrotik,rbm11g|\
+	mikrotik,rbm33g)
+		[ -z "$(rootfs_type)" ] && mtd erase firmware
+		;;
+	esac
+}
+
 platform_nand_pre_upgrade() {
 	local board=$(board_name)
 
@@ -318,17 +368,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