X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=1eb9354057548529b91f1db04b5bbb9d66b8c46a;hp=4ccacf4ef1ebfbc1c11c2dc1f7cc282f41d2766a;hb=4be45f131280312afc5c48a7d8096499fb53aab6;hpb=e63a0497a1a6ce7e7a6536f9287178a043b64880

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 4ccacf4ef1..1eb9354057 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2011 OpenWrt.org
 #
 
 . /lib/ar71xx.sh
@@ -15,7 +15,7 @@ platform_find_partitions() {
 	while read dev size erasesize name; do
 		name=${name#'"'}; name=${name%'"'}
 		case "$name" in
-			vmlinux.bin.l7|kernel|linux|rootfs)
+			vmlinux.bin.l7|vmlinux|kernel|linux|linux.bin|rootfs|filesystem)
 				if [ -z "$first" ]; then
 					first="$name"
 				else
@@ -31,7 +31,7 @@ platform_find_kernelpart() {
 	local part
 	for part in "${1%:*}" "${1#*:}"; do
 		case "$part" in
-			vmlinux.bin.l7|kernel|linux)
+			vmlinux.bin.l7|vmlinux|kernel|linux|linux.bin)
 				echo "$part"
 				break
 			;;
@@ -49,7 +49,7 @@ platform_do_upgrade_combined() {
 
 	if [ -n "$partitions" ] && [ -n "$kernelpart" ] && \
 	   [ ${kern_blocks:-0} -gt 0 ] && \
-	   [ ${root_blocks:-0} -gt ${kern_blocks:-0} ] && \
+	   [ ${root_blocks:-0} -gt 0 ] && \
 	   [ ${erase_size:-0} -gt 0 ];
 	then
 		local append=""
@@ -61,6 +61,18 @@ platform_do_upgrade_combined() {
 	fi
 }
 
+tplink_get_image_hwid() {
+	get_image "$@" | dd bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
+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"'
+}
+
+seama_get_type_magic() {
+	get_image "$@" | dd bs=1 count=4 skip=53 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
+}
+
 platform_check_image() {
 	local board=$(ar71xx_board_name)
 	local magic="$(get_magic_word "$1")"
@@ -69,49 +81,194 @@ platform_check_image() {
 	[ "$ARGC" -gt 1 ] && return 1
 
 	case "$board" in
-	ap81 | ap83 | dir-600-a1 | dir-615-c1 | dir-825-b1 | mzk-w04nu | mzk-w300nh | tew-632brp | wrt400n | bullet-m | nanostation-m | rocket-m | wzr-hp-g300nh | wzr-hp-g301nh | nbg460n_550n_550nh | unifi )
-		[ "$magic" != "2705" ] && {
+	all0315n | \
+	all0258n | \
+	cap4200ag)
+		platform_check_image_allnet "$1" && return 0
+		return 1
+		;;
+	alfa-ap96 | \
+	alfa-nx | \
+	ap113 | \
+	ap121 | \
+	ap121-mini | \
+	ap136-010 | \
+	ap136-020 | \
+	ap135-020 | \
+	ap96 | \
+	db120 | \
+	hornet-ub | \
+	bxu2000n-2-a1 | \
+	zcn-1523h-2 | \
+	zcn-1523h-5)
+		[ "$magic_long" != "68737173" -a "$magic_long" != "19852003" ] && {
 			echo "Invalid image type."
 			return 1
 		}
 		return 0
 		;;
-	tl-mr3220 | tl-mr3420 | tl-wa901nd | tl-wa901nd-v2 | tl-wr741nd | tl-wr841n-v1 | tl-wr941nd | tl-wr1043nd)
-		[ "$magic" != "0100" ] && {
+	ap81 | \
+	ap83 | \
+	ap132 | \
+	dir-505-a1 | \
+	dir-600-a1 | \
+	dir-615-c1 | \
+	dir-615-e4 | \
+	dir-825-c1 | \
+	dir-835-a1 | \
+	ew-dorin | \
+	ew-dorin-router | \
+	hornet-ub-x2 | \
+	mzk-w04nu | \
+	mzk-w300nh | \
+	tew-632brp | \
+	tew-712br | \
+	tew-732br | \
+	wrt400n | \
+	airrouter | \
+	bullet-m | \
+	nanostation-m | \
+	rocket-m | \
+	rw2458n | \
+	wndap360 | \
+	wzr-hp-g300nh2 | \
+	wzr-hp-g300nh | \
+	wzr-hp-g450h | \
+	wzr-hp-ag300h | \
+	whr-g301n | \
+	whr-hp-g300n | \
+	whr-hp-gn | \
+	wlae-ag300n | \
+	nbg460n_550n_550nh | \
+	unifi | \
+	unifi-outdoor | \
+	carambola2 )
+		[ "$magic" != "2705" ] && {
 			echo "Invalid image type."
 			return 1
 		}
 		return 0
 		;;
-	wndr3700)
-		[ "$magic_long" != "33373030" ] && {
+
+	dir-825-b1 | \
+	tew-673gru)
+		dir825b_check_image "$1" && return 0
+		;;
+
+	mynet-n600)
+		[ "$magic_long" != "5ea3a417" ] && {
+			echo "Invalid image, bad magic: $magic_long"
+			return 1
+		}
+
+		local typemagic=$(seama_get_type_magic "$1")
+		[ "$typemagic" != "6669726d" ] && {
+			echo "Invalid image, bad type: $typemagic"
+			return 1
+		}
+
+		return 0;
+		;;
+	mr600 | \
+	mr600v2 | \
+	om2p | \
+	om2p-hs | \
+	om2p-lc)
+		platform_check_image_openmesh "$magic_long" "$1" && return 0
+		return 1
+		;;
+
+	archer-c7 | \
+	tl-mr10u | \
+	tl-mr11u | \
+	tl-mr13u | \
+	tl-mr3020 | \
+	tl-mr3040 | \
+	tl-mr3040-v2 | \
+	tl-mr3220 | \
+	tl-mr3220-v2 | \
+	tl-mr3420 | \
+	tl-mr3420-v2 | \
+	tl-wa7510n | \
+	tl-wa750re | \
+	tl-wa850re | \
+	tl-wa901nd | \
+	tl-wa901nd-v2 | \
+	tl-wdr3500 | \
+	tl-wdr4300 | \
+	tl-wr703n | \
+	tl-wr710n | \
+	tl-wr720n-v3 | \
+	tl-wr741nd | \
+	tl-wr741nd-v4 | \
+	tl-wr841n-v1 | \
+	tl-wr841n-v7 | \
+	tl-wr841n-v8 | \
+	tl-wr941nd | \
+	tl-wr1041n-v2 | \
+	tl-wr1043nd | \
+	tl-wr2543n)
+		[ "$magic" != "0100" ] && {
 			echo "Invalid image type."
 			return 1
 		}
+
+		local hwid
+		local imageid
+
+		hwid=$(tplink_get_hwid)
+		imageid=$(tplink_get_image_hwid "$1")
+
+		[ "$hwid" != "$imageid" ] && {
+			echo "Invalid image, hardware ID mismatch, hw:$hwid image:$imageid."
+			return 1
+		}
+
+		local boot_size
+
+		boot_size=$(tplink_get_image_boot_size "$1")
+		[ "$boot_size" != "00000000" ] && {
+			echo "Invalid image, it contains a bootloader."
+			return 1
+		}
+
 		return 0
 		;;
-	wndr3700v2)
-		[ "$magic_long" != "33373031" ] && {
+	uap-pro)
+		[ "$magic_long" != "19852003" ] && {
 			echo "Invalid image type."
 			return 1
 		}
 		return 0
 		;;
-	wrt160nl)
-		[ "$magic" != "4e4c" ] && {
-			echo "Invalid image type."
+	wndr3700 | \
+	wnr612-v2)
+		local hw_magic
+
+		hw_magic="$(ar71xx_get_mtd_part_magic firmware)"
+		[ "$magic_long" != "$hw_magic" ] && {
+			echo "Invalid image, hardware ID mismatch, hw:$hw_magic image:$magic_long."
 			return 1
 		}
 		return 0
 		;;
-	zcn-1523h-2 | zcn-1523h-5)
-		[ "$magic" != "6873" -a "$magic" != "1985" ] && {
+	wrt160nl)
+		[ "$magic" != "4e4c" ] && {
 			echo "Invalid image type."
 			return 1
 		}
 		return 0
 		;;
-	routerstation | routerstation-pro | ls-sr71 | pb42 | pb44 | eap7660d | ja76pf )
+	routerstation | \
+	routerstation-pro | \
+	ls-sr71 | \
+	pb42 | \
+	pb44 | \
+	all0305 | \
+	eap7660d | \
+	ja76pf | \
+	ja76pf2 | \
+	jwap003)
 		[ "$magic" != "4349" ] && {
 			echo "Invalid image. Use *-sysupgrade.bin files on this board"
 			return 1
@@ -138,9 +295,42 @@ platform_do_upgrade() {
 	local board=$(ar71xx_board_name)
 
 	case "$board" in
-	routerstation | routerstation-pro | ls-sr71 | eap7660d | ja76pf )
+	routerstation | \
+	routerstation-pro | \
+	ls-sr71 | \
+	all0305 | \
+	eap7660d | \
+	pb42 | \
+	pb44 | \
+	ja76pf | \
+	ja76pf2 | \
+	jwap003)
 		platform_do_upgrade_combined "$ARGV"
 		;;
+	all0258n )
+		platform_do_upgrade_allnet "0x9f050000" "$ARGV"
+		;;
+	all0315n )
+		platform_do_upgrade_allnet "0x9f080000" "$ARGV"
+		;;
+	cap4200ag)
+		platform_do_upgrade_allnet "0xbf0a0000" "$ARGV"
+		;;
+	dir-825-b1 |\
+	tew-673gru)
+		platform_do_upgrade_dir825b "$ARGV"
+		;;
+	mr600 | \
+	mr600v2 | \
+	om2p | \
+	om2p-hs | \
+	om2p-lc)
+		platform_do_upgrade_openmesh "$ARGV"
+		;;
+	uap-pro)
+		MTD_CONFIG_ARGS="-s 0x180000"
+		default_do_upgrade "$ARGV"
+		;;
 	*)
 		default_do_upgrade "$ARGV"
 		;;