KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This way people forcing upgrade will know what may go wrong.

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

SVN-Revision: 45172
This commit is contained in:
Rafał Miłecki 2015-03-31 06:05:35 +00:00
parent 44dfe17576
commit a445846305
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
View file

@ -89,6 +89,7 @@ platform_check_image() {
local file_type=$(brcm47xx_identify "$1") local file_type=$(brcm47xx_identify "$1")
local magic local magic
local error=0
case "$file_type" in case "$file_type" in
"chk") "chk")
@ -100,16 +101,14 @@ platform_check_image() {
[ -n "$dev_board_id" -a "$board_id" != "$dev_board_id" ] && { [ -n "$dev_board_id" -a "$board_id" != "$dev_board_id" ] && {
echo "Firmware board_id doesn't match device 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=$(get_magic_long_at "$1" "$header_len")
[ "$magic" != "48445230" ] && { [ "$magic" != "48445230" ] && {
echo "No valid TRX firmware in the CHK image" echo "No valid TRX firmware in the CHK image"
return 1 error=1
} }
return 0
;; ;;
"cybertan") "cybertan")
local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"') local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"')
@ -118,25 +117,24 @@ platform_check_image() {
[ -n "$dev_pattern" -a "$pattern" != "$dev_pattern" ] && { [ -n "$dev_pattern" -a "$pattern" != "$dev_pattern" ] && {
echo "Firmware pattern doesn't match device 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=$(get_magic_long_at "$1" 32)
[ "$magic" != "48445230" ] && { [ "$magic" != "48445230" ] && {
echo "No valid TRX firmware in the CyberTAN image" echo "No valid TRX firmware in the CyberTAN image"
return 1 error=1
} }
return 0
;; ;;
"trx") "trx")
return 0
;; ;;
*) *)
echo "Invalid image type. Please use only .trx files" echo "Invalid image type. Please use only .trx files"
return 1 error=1
;; ;;
esac esac
return $error
} }
platform_do_upgrade_chk() { platform_do_upgrade_chk() {