Skip to content
Snippets Groups Projects
Commit 175b3c6e authored by rmilecki's avatar rmilecki
Browse files

bcm53xx: display all errors (not just the 1st one) when checking image


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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45291 3c298f89-4303-0410-b956-a3cf2f4a3e73
parent 59a52e4e
No related branches found
No related tags found
No related merge requests found
......@@ -64,6 +64,7 @@ platform_check_image() {
local file_type=$(platform_identify "$1")
local magic
local error=0
case "$file_type" in
"chk")
......@@ -75,16 +76,14 @@ platform_check_image() {
[ -n "$dev_board_id" -a "chk $board_id" != "$dev_board_id" ] && {
echo "Firmware board_id doesn't match device board_id ($dev_board_id)"
return 1
error=1
}
magic=$(get_magic_long_at "$1" "$header_len")
[ "$magic" != "48445230" ] && {
echo "No valid TRX firmware in the CHK image"
return 1
error=1
}
return 0
;;
"cybertan")
local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"')
......@@ -93,25 +92,24 @@ platform_check_image() {
[ -n "$dev_pattern" -a "cybertan $pattern" != "$dev_pattern" ] && {
echo "Firmware pattern doesn't match device pattern ($dev_pattern)"
return 1
error=1
}
magic=$(get_magic_long_at "$1" 32)
[ "$magic" != "48445230" ] && {
echo "No valid TRX firmware in the CyberTAN image"
return 1
error=1
}
return 0
;;
"trx")
return 0
;;
*)
echo "Invalid image type. Please use only .trx files"
return 1
error=1
;;
esac
return $error
}
# Extract TRX and use stadard upgrade method
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment