From: Rafał Miłecki <zajec5@gmail.com>
Date: Tue, 30 Dec 2014 17:19:02 +0000 (+0000)
Subject: brcm47xx: verify if CHK/CyberTAN contains valid TRX
X-Git-Tag: reboot~4857
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cca3990b160906f02521f20d5ffcb8d610880a39;p=openwrt%2Fstaging%2Fchunkeey.git

brcm47xx: verify if CHK/CyberTAN contains valid TRX

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 43798
---

diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
index 1cb11b5475..0a09da51a4 100644
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
@@ -34,6 +34,7 @@ platform_check_image() {
 	[ "$#" -gt 1 ] && return 1
 
 	local file_type=$(brcm47xx_identify "$1")
+	local magic
 
 	case "$file_type" in
 		"chk")
@@ -41,12 +42,26 @@ platform_check_image() {
 			local board_id_len=$(($header_len - 40))
 			local board_id=$(dd if="$1" skip=40 bs=1 count=$board_id_len 2>/dev/null | hexdump -v -e '1/1 "%c"')
 			echo "Found CHK image with device board_id $board_id"
+
+			magic=$(get_magic_long_at "$1" "$header_len")
+			[ "$magic" != "48445230" ] && {
+				echo "No valid TRX firmware in the CHK image"
+				return 1
+			}
+
 			echo "Flashing CHK images in unsupported. Please use only .trx files."
 			return 1
 		;;
 		"cybertan")
-			local magic=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"')
+			magic=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"')
 			echo "Found CyberTAN image with device magic: $magic"
+
+			magic=$(get_magic_long_at "$1" 32)
+			[ "$magic" != "48445230" ] && {
+				echo "No valid TRX firmware in the CyberTAN image"
+				return 1
+			}
+
 			echo "Flashing CyberTAN images in unsupported. Please use only .trx files."
 			return 1
 		;;