diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-03-31 06:05:35 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-03-31 06:05:35 +0000 |
| commit | a445846305cc87ee4054341ba5c93132a02d901a (patch) | |
| tree | a47bb241435734f70b175fa3faad9bab4f870161 | |
| parent | 44dfe1757696b21222f64267ba5da2506ac233f4 (diff) | |
| download | upstream-a445846305cc87ee4054341ba5c93132a02d901a.tar.gz upstream-a445846305cc87ee4054341ba5c93132a02d901a.tar.bz2 upstream-a445846305cc87ee4054341ba5c93132a02d901a.zip | |
brcm47xx: display all errors (not just the 1st one) when checking image
This way people forcing upgrade will know what may go wrong.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 45172
| -rw-r--r-- | target/linux/brcm47xx/base-files/lib/upgrade/platform.sh | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh index d4017b4980..9e8db8a137 100644 --- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh @@ -89,6 +89,7 @@ platform_check_image() { local file_type=$(brcm47xx_identify "$1") local magic + local error=0 case "$file_type" in "chk") @@ -100,16 +101,14 @@ platform_check_image() { [ -n "$dev_board_id" -a "$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"') @@ -118,25 +117,24 @@ platform_check_image() { [ -n "$dev_pattern" -a "$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 } platform_do_upgrade_chk() { |