Author: rmilecki Date: 2014-12-30 18:19:02 +0100 (Tue, 30 Dec 2014) New Revision: 43798
Modified: trunk/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh Log: brcm47xx: verify if CHK/CyberTAN contains valid TRX Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh =================================================================== --- trunk/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh 2014-12-29 17:11:13 UTC (rev 43797) +++ trunk/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh 2014-12-30 17:19:02 UTC (rev 43798) @@ -34,6 +34,7 @@ [ "$#" -gt 1 ] && return 1 local file_type=$(brcm47xx_identify "$1") + local magic case "$file_type" in "chk") @@ -41,12 +42,26 @@ 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 ;; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
