X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=b2181af5b571073ff66b0bbc00abb28ad015c6a9;hp=9f4ce2cb833e772a4e092b3da5bda2471da29bcf;hb=037b42838f54aa2a90a31901029371c3ae9b8c03;hpb=e70ad61e4451ec23e843ba00365ac7e928392adf

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index 9f4ce2cb83..b2181af5b5 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
 			;;
@@ -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=""
@@ -65,6 +65,47 @@ 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"'
+}
+
+cybertan_get_image_magic() {
+	get_image "$@" | dd bs=8 count=1 skip=0  2>/dev/null | hexdump -v -n 8 -e '1/1 "%02x"'
+}
+
+cybertan_check_image() {
+	local magic="$(cybertan_get_image_magic "$1")"
+	local fw_magic="$(cybertan_get_hw_magic)"
+
+	[ "$fw_magic" != "$magic" ] && {
+		echo "Invalid image, ID mismatch, got:$magic, but need:$fw_magic"
+		return 1
+	}
+
+	return 0
+}
+
+platform_do_upgrade_compex() {
+	local fw_file=$1
+	local fw_part=$PART_NAME
+	local fw_mtd=$(find_mtd_part $fw_part)
+	local fw_length=0x$(dd if="$fw_file" bs=2 skip=1 count=4 2>/dev/null)
+	local fw_blocks=$(($fw_length / 65536))
+
+	if [ -n "$fw_mtd" ] &&  [ ${fw_blocks:-0} -gt 0 ]; then
+		local append=""
+		[ -f "$CONF_TAR" -a "$SAVE_CONFIG" -eq 1 ] && append="-j $CONF_TAR"
+
+		sync
+		dd if="$fw_file" bs=64k skip=1 count=$fw_blocks 2>/dev/null | \
+			mtd $append write - "$fw_part"
+	fi
+}
+
 platform_check_image() {
 	local board=$(ar71xx_board_name)
 	local magic="$(get_magic_word "$1")"
@@ -74,7 +115,8 @@ platform_check_image() {
 
 	case "$board" in
 	all0315n | \
-	all0258n )
+	all0258n | \
+	cap4200ag)
 		platform_check_image_allnet "$1" && return 0
 		return 1
 		;;
@@ -83,10 +125,13 @@ platform_check_image() {
 	ap113 | \
 	ap121 | \
 	ap121-mini | \
-	ap136 | \
+	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" ] && {
@@ -97,23 +142,29 @@ platform_check_image() {
 		;;
 	ap81 | \
 	ap83 | \
+	ap132 | \
+	dir-505-a1 | \
 	dir-600-a1 | \
 	dir-615-c1 | \
 	dir-615-e4 | \
-	dir-825-b1 | \
+	dir-825-c1 | \
+	dir-835-a1 | \
+	dragino2 | \
 	ew-dorin | \
 	ew-dorin-router | \
+	hornet-ub-x2 | \
 	mzk-w04nu | \
 	mzk-w300nh | \
 	tew-632brp | \
-	tew-673gru | \
 	tew-712br | \
+	tew-732br | \
 	wrt400n | \
 	airrouter | \
 	bullet-m | \
 	nanostation-m | \
 	rocket-m | \
 	rw2458n | \
+	wndap360 | \
 	wzr-hp-g300nh2 | \
 	wzr-hp-g300nh | \
 	wzr-hp-g450h | \
@@ -123,34 +174,84 @@ platform_check_image() {
 	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
+		;;
+
+	mynet-rext|\
+	wrt160nl)
+		cybertan_check_image "$1" && return 0
+		return 1
+		;;
+
+	mynet-n600 | \
+	mynet-n750)
+		[ "$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_om2p "$magic_long" "$1" && return 0
+		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-wa801nd-v2 | \
 	tl-wa901nd | \
 	tl-wa901nd-v2 | \
+	tl-wa901nd-v3 | \
+	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-wr842n-v2 | \
 	tl-wr941nd | \
 	tl-wr1041n-v2 | \
 	tl-wr1043nd | \
+	tl-wr1043nd-v2 | \
 	tl-wr2543n)
 		[ "$magic" != "0100" ] && {
 			echo "Invalid image type."
@@ -168,9 +269,25 @@ 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)
+	wndr3700 | \
+	wnr612-v2)
 		local hw_magic
 
 		hw_magic="$(ar71xx_get_mtd_part_magic firmware)"
@@ -180,13 +297,6 @@ platform_check_image() {
 		}
 		return 0
 		;;
-	wrt160nl)
-		[ "$magic" != "4e4c" ] && {
-			echo "Invalid image type."
-			return 1
-		}
-		return 0
-		;;
 	routerstation | \
 	routerstation-pro | \
 	ls-sr71 | \
@@ -195,7 +305,10 @@ platform_check_image() {
 	all0305 | \
 	eap7660d | \
 	ja76pf | \
-	ja76pf2)
+	ja76pf2 | \
+	jwap003 | \
+	wp543 | \
+	wpe72)
 		[ "$magic" != "4349" ] && {
 			echo "Invalid image. Use *-sysupgrade.bin files on this board"
 			return 1
@@ -230,18 +343,37 @@ platform_do_upgrade() {
 	pb42 | \
 	pb44 | \
 	ja76pf | \
-	ja76pf2)
+	ja76pf2 | \
+	jwap003)
 		platform_do_upgrade_combined "$ARGV"
 		;;
+	wp543|\
+	wpe72)
+		platform_do_upgrade_compex "$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_om2p "$ARGV"
+		platform_do_upgrade_openmesh "$ARGV"
+		;;
+	uap-pro)
+		MTD_CONFIG_ARGS="-s 0x180000"
+		default_do_upgrade "$ARGV"
 		;;
 	*)
 		default_do_upgrade "$ARGV"