X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=c57e5d5c748dd5214b47ad6767a3d20cd191336e;hb=5a9c95d90de4f5f82d14acb24ddbb7a78a3d550d;hp=5e5a54f6d243432b011d7a316b0ea2a5baed68e4;hpb=0e503f85bf4e8054f992fcae676233d4c558d9a5;p=openwrt.git

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 5e5a54f6d2..c57e5d5c74 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.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|vmlinux|kernel|linux|rootfs|filesystem)
+			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|vmlinux|kernel|linux)
+			vmlinux.bin.l7|vmlinux|kernel|linux|linux.bin)
 				echo "$part"
 				break
 			;;
@@ -65,6 +65,10 @@ 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"'
+}
+
 platform_check_image() {
 	local board=$(ar71xx_board_name)
 	local magic="$(get_magic_word "$1")"
@@ -73,8 +77,10 @@ platform_check_image() {
 	[ "$ARGC" -gt 1 ] && return 1
 
 	case "$board" in
-	all0258n )
-		platform_check_image_all0258n "$1" && return 0
+	all0315n | \
+	all0258n | \
+	cap4200ag)
+		platform_check_image_allnet "$1" && return 0
 		return 1
 		;;
 	alfa-ap96 | \
@@ -82,7 +88,9 @@ platform_check_image() {
 	ap113 | \
 	ap121 | \
 	ap121-mini | \
-	ap136 | \
+	ap136-010 | \
+	ap136-020 | \
+	ap135-020 | \
 	ap96 | \
 	db120 | \
 	hornet-ub | \
@@ -94,23 +102,27 @@ platform_check_image() {
 		}
 		return 0
 		;;
-	ew-dorin | \
 	ap81 | \
 	ap83 | \
+	ap132 | \
 	dir-600-a1 | \
 	dir-615-c1 | \
 	dir-615-e4 | \
-	dir-825-b1 | \
+	dir-825-c1 | \
+	dir-835-a1 | \
+	ew-dorin | \
+	ew-dorin-router | \
 	mzk-w04nu | \
 	mzk-w300nh | \
 	tew-632brp | \
-	tew-673gru | \
+	tew-712br | \
 	wrt400n | \
 	airrouter | \
 	bullet-m | \
 	nanostation-m | \
 	rocket-m | \
 	rw2458n | \
+	wndap360 | \
 	wzr-hp-g300nh2 | \
 	wzr-hp-g300nh | \
 	wzr-hp-g450h | \
@@ -118,31 +130,53 @@ platform_check_image() {
 	whr-g301n | \
 	whr-hp-g300n | \
 	whr-hp-gn | \
+	wlae-ag300n | \
 	nbg460n_550n_550nh | \
-	unifi )
+	unifi | \
+	unifi-outdoor | \
+	carambola2 )
 		[ "$magic" != "2705" ] && {
 			echo "Invalid image type."
 			return 1
 		}
 		return 0
 		;;
+
+	dir-825-b1 | \
+	tew-673gru)
+		dir825b_check_image "$1" && return 0
+		;;
+
+	mr600 | \
+	mr600v2 | \
 	om2p | \
+	om2p-hs | \
 	om2p-lc)
-		platform_check_image_om2p "$magic_long" "$1" && return 0
+		platform_check_image_openmesh "$magic_long" "$1" && return 0
 		return 1
 		;;
+
+	archer-c7 | \
+	tl-mr10u | \
 	tl-mr11u | \
 	tl-mr3020 | \
+	tl-mr3040 | \
 	tl-mr3220 | \
+	tl-mr3220-v2 | \
 	tl-mr3420 | \
+	tl-mr3420-v2 | \
+	tl-wa7510n | \
 	tl-wa901nd | \
 	tl-wa901nd-v2 | \
+	tl-wdr3500 | \
 	tl-wdr4300 | \
 	tl-wr703n | \
+	tl-wr720n-v3 | \
 	tl-wr741nd | \
 	tl-wr741nd-v4 | \
 	tl-wr841n-v1 | \
 	tl-wr841n-v7 | \
+	tl-wr841n-v8 | \
 	tl-wr941nd | \
 	tl-wr1041n-v2 | \
 	tl-wr1043nd | \
@@ -163,6 +197,21 @@ platform_check_image() {
 			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
+		;;
+	uap-pro)
+		[ "$magic_long" != "19852003" ] && {
+			echo "Invalid image type."
+			return 1
+		}
 		return 0
 		;;
 	wndr3700)
@@ -187,9 +236,11 @@ platform_check_image() {
 	ls-sr71 | \
 	pb42 | \
 	pb44 | \
+	all0305 | \
 	eap7660d | \
 	ja76pf | \
-	ja76pf2)
+	ja76pf2 | \
+	jwap003)
 		[ "$magic" != "4349" ] && {
 			echo "Invalid image. Use *-sysupgrade.bin files on this board"
 			return 1
@@ -219,19 +270,34 @@ platform_do_upgrade() {
 	routerstation | \
 	routerstation-pro | \
 	ls-sr71 | \
+	all0305 | \
 	eap7660d | \
 	pb42 | \
 	pb44 | \
 	ja76pf | \
-	ja76pf2)
+	ja76pf2 | \
+	jwap003)
 		platform_do_upgrade_combined "$ARGV"
 		;;
 	all0258n )
-		platform_do_upgrade_all0258n "$ARGV"
+		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_om2p "$ARGV"
+		platform_do_upgrade_openmesh "$ARGV"
 		;;
 	*)
 		default_do_upgrade "$ARGV"