aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-04-07 14:14:02 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-04-07 14:14:02 +0000
commit90bc0bce64e80fc107a91db326210257674ec1fe (patch)
tree98c64d298570f79175826c684c9e762c6abaf70f
parent60290ed40c467c7742b1a7f18c042b442b47a983 (diff)
downloadupstream-90bc0bce64e80fc107a91db326210257674ec1fe.tar.gz
upstream-90bc0bce64e80fc107a91db326210257674ec1fe.tar.bz2
upstream-90bc0bce64e80fc107a91db326210257674ec1fe.zip
bcm53xx: display all errors (not just the 1st one) when checking image
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45291 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/bcm53xx/base-files/lib/upgrade/platform.sh18
1 files changed, 8 insertions, 10 deletions
diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index 17456b6cda..8055b4fa33 100644
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -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