From: Rafał Miłecki <zajec5@gmail.com>
Date: Thu, 9 Apr 2015 05:22:04 +0000 (+0000)
Subject: brcm47xx: switch to the otrx for verifying TRX images
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=44b128b0aa202e6539b9375197a0703c2c37dc36;p=openwrt%2Fstaging%2Fadrian.git

brcm47xx: switch to the otrx for verifying TRX images

This adds checking CRC32 of provided firmware image.

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

SVN-Revision: 45316
---

diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index cde8f1442a..22b8674b02 100644
--- a/target/linux/brcm47xx/Makefile
+++ b/target/linux/brcm47xx/Makefile
@@ -22,7 +22,7 @@ define Target/Description
 	Build firmware images for Broadcom based BCM47xx/53xx routers with MIPS CPU, *not* ARM.
 endef
 
-DEFAULT_PACKAGES += swconfig wpad-mini nvram \
+DEFAULT_PACKAGES += swconfig wpad-mini nvram otrx \
 	kmod-leds-gpio kmod-gpio-button-hotplug \
 	kmod-ledtrig-default-on kmod-ledtrig-timer kmod-ledtrig-netdev
 
diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
index f5b9bda690..b9110a7589 100644
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
@@ -77,20 +77,6 @@ brcm47xx_identify() {
 	echo "unknown"
 }
 
-# $(1): image that should contain trx
-# $(2): trx offset in image
-platform_check_image_trx() {
-	local magic=$(get_magic_long_at "$1" $2)
-
-	[ "$magic" != "48445230" ] && {
-		return 1
-	}
-
-	# TODO: Check crc32
-
-	return 0
-}
-
 platform_check_image() {
 	[ "$#" -gt 1 ] && return 1
 
@@ -111,7 +97,7 @@ platform_check_image() {
 				error=1
 			}
 
-			if ! platform_check_image_trx "$1" "$header_len"; then
+			if ! otrx -c "$1" -o "$header_len"; then
 				echo "No valid TRX firmware in the CHK image"
 				error=1
 			fi
@@ -126,7 +112,7 @@ platform_check_image() {
 				error=1
 			}
 
-			if ! platform_check_image_trx "$1" 32; then
+			if ! otrx -c "$1" -o 32; then
 				echo "No valid TRX firmware in the CyberTAN image"
 				error=1
 			fi