aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-04-16 21:43:27 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-04-16 21:43:27 +0000
commite85294a957970b2cc50349bb3ec3f4c0113e22fd (patch)
tree72eb78d6e0e1e8b1a65b8758016619f23a228a7d
parentc8eed9a50a62afafe239d09d99521838daa978b4 (diff)
downloadupstream-e85294a957970b2cc50349bb3ec3f4c0113e22fd.tar.gz
upstream-e85294a957970b2cc50349bb3ec3f4c0113e22fd.tar.bz2
upstream-e85294a957970b2cc50349bb3ec3f4c0113e22fd.zip
brcm47xx: rework vendor fw handling to don't duplicate upgrade calls
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 45470
-rw-r--r--target/linux/brcm47xx/base-files/lib/upgrade/platform.sh24
1 files changed, 10 insertions, 14 deletions
diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
index 83d3dee625..0fc0388f6d 100644
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
@@ -133,29 +133,25 @@ platform_check_image() {
return $error
}
-platform_do_upgrade_chk() {
+platform_extract_trx_from_chk() {
local header_len=$((0x$(get_magic_long_at "$1" 4)))
- local trx="/tmp/$1.trx"
- dd if="$1" of="$trx" bs=$header_len skip=1
- shift
- default_do_upgrade "$trx" "$@"
+ dd if="$1" of="$2" bs=$header_len skip=1
}
-platform_do_upgrade_cybertan() {
- local trx="/tmp/$1.trx"
-
- dd if="$1" of="$trx" bs=32 skip=1
- shift
- default_do_upgrade "$trx" "$@"
+platform_extract_trx_from_cybertan() {
+ dd if="$1" of="$2" bs=32 skip=1
}
platform_do_upgrade() {
local file_type=$(brcm47xx_identify "$1")
+ local trx="$1"
case "$file_type" in
- "chk") platform_do_upgrade_chk "$ARGV";;
- "cybertan") platform_do_upgrade_cybertan "$ARGV";;
- *) default_do_upgrade "$ARGV";;
+ "chk") trx="/tmp/$1.trx"; platform_extract_trx_from_chk "$1" "$trx";;
+ "cybertan") trx="/tmp/$1.trx"; platform_extract_trx_from_cybertan "$1" "$trx";;
esac
+
+ shift
+ default_do_upgrade "$trx" "$@"
}