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=5488972d59ffd19f1df81a0eeaa932e5a6ae7f22;hp=036e19afe35f681e96ea7ed59a398805edf92f69;hb=5881e2434fce53724c5d09b365945429a4985c41;hpb=18618695aedf8cf593ca5bb5a5a0b4c97e53dd2f

diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 036e19afe3..5488972d59 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -2,13 +2,10 @@
 # Copyright (C) 2010 OpenWrt.org
 #
 
-. /lib/ramips.sh
-
 PART_NAME=firmware
-RAMFS_COPY_DATA=/lib/ramips.sh
 
 platform_check_image() {
-	local board=$(ramips_board_name)
+	local board=$(board_name)
 	local magic="$(get_magic_long "$1")"
 
 	[ "$#" -gt 1 ] && return 1
@@ -17,23 +14,26 @@ platform_check_image() {
 	3g150b|\
 	3g300m|\
 	a5-v11|\
-	ac1200pro|\
 	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|\
 	awapn2403|\
 	awm002-evb-4M|\
 	awm002-evb-8M|\
-	awm003-evb|\
 	bc2|\
+	bocco|\
 	broadway|\
+	c108|\
 	carambola|\
 	cf-wr800n|\
 	cs-qr10|\
@@ -53,7 +53,6 @@ platform_check_image() {
 	dir-620-d1|\
 	dir-810l|\
 	duzun-dm06|\
-	dwr-512-b|\
 	e1700|\
 	esr-9753|\
 	ew1200|\
@@ -63,9 +62,12 @@ platform_check_image() {
 	firewrt|\
 	fonera20n|\
 	freestation5|\
+	gnubee,gb-pc1|\
+	gnubee,gb-pc2|\
 	gl-mt300a|\
 	gl-mt300n|\
 	gl-mt750|\
+	gl-mt300n-v2|\
 	hc5*61|\
 	hc5661a|\
 	hg255d|\
@@ -77,11 +79,12 @@ platform_check_image() {
 	jhr-n805r|\
 	jhr-n825r|\
 	jhr-n926r|\
+	k2p|\
+	kn|\
 	kn_rc|\
 	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|\
@@ -127,8 +131,10 @@ platform_check_image() {
 	rp-n53|\
 	rt5350f-olinuxino|\
 	rt5350f-olinuxino-evb|\
+	rt-ac51u|\
 	rt-g32-b1|\
 	rt-n10-plus|\
+	rt-n12p|\
 	rt-n13u|\
 	rt-n14u|\
 	rt-n15|\
@@ -137,29 +143,39 @@ platform_check_image() {
 	sap-g3200u3|\
 	sk-wb8|\
 	sl-r7205|\
+	tama,w06|\
+	tew-638apb-v2|\
 	tew-691gr|\
 	tew-692gr|\
 	tew-714tru|\
 	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|\
+	vocore2lite|\
 	vr500|\
 	w150m|\
 	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|\
@@ -168,6 +184,7 @@ platform_check_image() {
 	wl-wn575a3|\
 	wli-tx4-ag300n|\
 	wlr-6000|\
+	wmdr-143n|\
 	wmr-300|\
 	wn3000rpv3|\
 	wnce2001|\
@@ -189,14 +206,22 @@ 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-we826|\
+	zbtlink,zbt-we3526|\
+	zbt-we826-16M|\
+	zbt-we826-32M|\
 	zbt-wg2626|\
-	zbt-wg3526|\
+	zbt-wg3526-16M|\
+	zbt-wg3526-32M|\
 	zbt-wr8305rt|\
+	zorlik,zl5900v2|\
 	zte-q7|\
 	youku-yk1)
 		[ "$magic" != "27051956" ] && {
@@ -224,7 +249,16 @@ platform_check_image() {
 		;;
 	c20i|\
 	c50|\
-	mr200)
+	mr200|\
+	tplink,c20-v1|\
+	tplink,c20-v4|\
+	tplink,c50-v3|\
+	tplink,tl-mr3420-v5|\
+	tplink,tl-wr842n-v5|\
+	tplink,tl-wr902ac-v3|\
+	tl-wr840n-v4|\
+	tl-wr840n-v5|\
+	tl-wr841n-v13)
 		[ "$magic" != "03000000" ] && {
 			echo "Invalid image type."
 			return 1
@@ -242,15 +276,30 @@ platform_check_image() {
 		}
 		return 0
 		;;
-	hc5962|\
-	r6220)
-		# these boards use metadata images
+	dlink,dwr-116-a1|\
+	dlink,dwr-921-c1|\
+	dwr-512-b)
+		[ "$magic" != "0404242b" ] && {
+			echo "Invalid image type."
+			return 1
+		}
 		return 0
 		;;
-	ubnt-erx)
+	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" ] && {
@@ -266,48 +315,35 @@ platform_check_image() {
 }
 
 platform_nand_pre_upgrade() {
-	local board=$(ramips_board_name)
+	local board=$(board_name)
 
 	case "$board" in
-	ubnt-erx)
+	ubnt-erx|\
+	ubnt-erx-sfp)
 		platform_upgrade_ubnt_erx "$ARGV"
 		;;
 	esac
 }
 
-platform_pre_upgrade() {
-	local board=$(ramips_board_name)
+platform_do_upgrade() {
+	local board=$(board_name)
 
 	case "$board" in
 	hc5962|\
+	mir3g|\
 	r6220|\
-    	ubnt-erx)
+	ubnt-erx|\
+	ubnt-erx-sfp)
 		nand_do_upgrade "$ARGV"
 		;;
-	esac
-}
-
-platform_do_upgrade() {
-	local board=$(ramips_board_name)
-
-	case "$board" in
 	*)
 		default_do_upgrade "$ARGV"
 		;;
 	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