Author: rmilecki Date: 2015-04-09 08:33:56 +0200 (Thu, 09 Apr 2015) New Revision: 45320
Modified: trunk/target/linux/bcm53xx/Makefile trunk/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh Log: bcm53xx: switch to the otrx for verifying TRX images This adds checking CRC32 of provided firmware image. Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/target/linux/bcm53xx/Makefile =================================================================== --- trunk/target/linux/bcm53xx/Makefile 2015-04-09 05:40:37 UTC (rev 45319) +++ trunk/target/linux/bcm53xx/Makefile 2015-04-09 06:33:56 UTC (rev 45320) @@ -23,7 +23,7 @@ KERNELNAME:=zImage dtbs -DEFAULT_PACKAGES += swconfig wpad-mini nvram \ +DEFAULT_PACKAGES += swconfig wpad-mini nvram otrx \ kmod-gpio-button-hotplug \ kmod-leds-gpio kmod-ledtrig-default-on kmod-ledtrig-timer Modified: trunk/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh =================================================================== --- trunk/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh 2015-04-09 05:40:37 UTC (rev 45319) +++ trunk/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh 2015-04-09 06:33:56 UTC (rev 45320) @@ -54,20 +54,6 @@ 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 @@ -93,7 +79,7 @@ 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 @@ -108,12 +94,16 @@ 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 ;; "trx") + if ! otrx -c "$1"; then + echo "Invalid (corrupted?) TRX firmware" + error=1 + fi ;; *) echo "Invalid image type. Please use only .trx files" _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
