X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=e0a260216d510e7954f2b4e4afe9af374d7d4443;hb=f12a32630ff5;hp=06931c8b164f2dab87f4a8f1c85067e3da93611d;hpb=d48cc5e0449fec6f7717e85a68f06a61abd7b0ae;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 06931c8b16..e0a260216d 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,17 +14,19 @@ platform_check_image() {
 	3g150b|\
 	3g300m|\
 	a5-v11|\
-	ac1200pro|\
 	ai-br100|\
 	air3gii|\
 	all0239-3g|\
-	all0256n|\
+	all0256n-4M|\
+	all0256n-8M|\
 	all5002|\
 	all5003|\
 	ar725w|\
-	asl26555|\
+	asl26555-8M|\
+	asl26555-16M|\
 	awapn2403|\
-	awm002-evb|\
+	awm002-evb-4M|\
+	awm002-evb-8M|\
 	awm003-evb|\
 	bc2|\
 	broadway|\
@@ -53,7 +52,9 @@ platform_check_image() {
 	dwr-512-b|\
 	e1700|\
 	esr-9753|\
+	ew1200|\
 	ex2700|\
+	ex3700|\
 	f7c027|\
 	firewrt|\
 	fonera20n|\
@@ -61,6 +62,7 @@ platform_check_image() {
 	gl-mt300a|\
 	gl-mt300n|\
 	gl-mt750|\
+	gl-mt300n-v2|\
 	hc5*61|\
 	hc5661a|\
 	hg255d|\
@@ -72,6 +74,7 @@ platform_check_image() {
 	jhr-n805r|\
 	jhr-n825r|\
 	jhr-n926r|\
+	kn|\
 	kn_rc|\
 	kn_rf|\
 	kng_rc|\
@@ -79,7 +82,8 @@ platform_check_image() {
 	linkits7688d|\
 	m2m|\
 	m3|\
-	m4|\
+	m4-4M|\
+	m4-8M|\
 	mac1200rv2|\
 	microwrt|\
 	miniembplug|\
@@ -102,7 +106,8 @@ platform_check_image() {
 	nbg-419n|\
 	nbg-419n2|\
 	newifi-d1|\
-	nixcore|\
+	nixcore-x1-8M|\
+	nixcore-x1-16M|\
 	nw718|\
 	omega2|\
 	omega2p|\
@@ -110,14 +115,17 @@ platform_check_image() {
 	pbr-d1|\
 	pbr-m1|\
 	psg1208|\
-	psg1218|\
+	psg1218a|\
+	psg1218b|\
 	psr-680w|\
-	px-4885|\
+	px-4885-4M|\
+	px-4885-8M|\
 	rb750gr3|\
 	re6500|\
 	rp-n53|\
 	rt5350f-olinuxino|\
 	rt5350f-olinuxino-evb|\
+	rt-ac51u|\
 	rt-g32-b1|\
 	rt-n10-plus|\
 	rt-n13u|\
@@ -128,6 +136,7 @@ platform_check_image() {
 	sap-g3200u3|\
 	sk-wb8|\
 	sl-r7205|\
+	tew-638apb-v2|\
 	tew-691gr|\
 	tew-692gr|\
 	tew-714tru|\
@@ -136,7 +145,8 @@ platform_check_image() {
 	ur-326n4g|\
 	ur-336un|\
 	v22rw-2x2|\
-	vocore|\
+	vocore-8M|\
+	vocore-16M|\
 	vocore2|\
 	vr500|\
 	w150m|\
@@ -162,15 +172,18 @@ platform_check_image() {
 	wn3000rpv3|\
 	wnce2001|\
 	wndr3700v5|\
-	wr512-3gn|\
+	wr512-3gn-4M|\
+	wr512-3gn-8M|\
 	wr6202|\
 	wrh-300cr|\
 	wrtnode|\
 	wrtnode2r |\
 	wrtnode2p |\
 	wsr-600|\
-	wt1520|\
-	wt3020|\
+	wt1520-4M|\
+	wt1520-8M|\
+	wt3020-4M|\
+	wt3020-8M|\
 	wzr-agl300nh|\
 	x5|\
 	x8|\
@@ -179,9 +192,13 @@ platform_check_image() {
 	zbt-ape522ii|\
 	zbt-cpe102|\
 	zbt-wa05|\
-	zbt-we826|\
+	zbt-we1326|\
+	zbt-we2026|\
+	zbt-we826-16M|\
+	zbt-we826-32M|\
 	zbt-wg2626|\
-	zbt-wg3526|\
+	zbt-wg3526-16M|\
+	zbt-wg3526-32M|\
 	zbt-wr8305rt|\
 	zte-q7|\
 	youku-yk1)
@@ -210,7 +227,9 @@ platform_check_image() {
 		;;
 	c20i|\
 	c50|\
-	mr200)
+	mr200|\
+	tl-wr840n-v4|\
+	tl-wr841n-v13)
 		[ "$magic" != "03000000" ] && {
 			echo "Invalid image type."
 			return 1
@@ -228,7 +247,13 @@ platform_check_image() {
 		}
 		return 0
 		;;
-	ubnt-erx)
+	hc5962|\
+	r6220)
+		# these boards use metadata images
+		return 0
+		;;
+	ubnt-erx|\
+	ubnt-erx-sfp)
 		nand_do_platform_check "$board" "$1"
 		return $?;
 		;;
@@ -247,29 +272,26 @@ 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
-    	ubnt-erx)
+	hc5962|\
+	r6220|\
+	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"
 		;;