Author: rmilecki Date: 2015-03-31 23:16:19 +0200 (Tue, 31 Mar 2015) New Revision: 45202
Modified: trunk/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh Log: brcm47xx: image: share function checking TRX in provided firmware This will allow us to calculate crc32 in a shared code. 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 2015-03-31 19:28:39 UTC (rev 45201) +++ trunk/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh 2015-03-31 21:16:19 UTC (rev 45202) @@ -77,6 +77,20 @@ 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 @@ -97,11 +111,10 @@ error=1 } - magic=$(get_magic_long_at "$1" "$header_len") - [ "$magic" != "48445230" ] && { + if ! platform_check_image_trx "$1" "$header_len"; then echo "No valid TRX firmware in the CHK image" error=1 - } + fi ;; "cybertan") local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"') @@ -113,11 +126,10 @@ error=1 } - magic=$(get_magic_long_at "$1" 32) - [ "$magic" != "48445230" ] && { + if ! platform_check_image_trx "$1" 32; then echo "No valid TRX firmware in the CyberTAN image" error=1 - } + fi ;; "trx") ;; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
