aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/base-files/lib/upgrade
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-04-12 10:42:27 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-04-12 10:42:27 +0000
commita04b71d330589c562a70faa7bf1afc29b58da362 (patch)
treece08d8ae63cde04c91488463b35778449612feb3 /target/linux/bcm53xx/base-files/lib/upgrade
parent8904cd1dcca81e0e4cf5e36cea6a180bfe5aaa0e (diff)
downloadupstream-a04b71d330589c562a70faa7bf1afc29b58da362.tar.gz
upstream-a04b71d330589c562a70faa7bf1afc29b58da362.tar.bz2
upstream-a04b71d330589c562a70faa7bf1afc29b58da362.zip
bcm53xx: rework vendor fw handling to don't duplicate upgrade calls
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 45389
Diffstat (limited to 'target/linux/bcm53xx/base-files/lib/upgrade')
-rw-r--r--target/linux/bcm53xx/base-files/lib/upgrade/platform.sh44
1 files changed, 15 insertions, 29 deletions
diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index ed84386a68..c3f9a14c78 100644
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -114,44 +114,30 @@ platform_check_image() {
return $error
}
-# Extract TRX and use stadard upgrade method
-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
- platform_do_upgrade_trx "$trx" "$@"
+ dd if="$1" of="$2" bs=$header_len skip=1
}
-# Extract TRX and use stadard upgrade method
-platform_do_upgrade_cybertan() {
- local trx="/tmp/$1.trx"
-
- dd if="$1" of="$trx" bs=32 skip=1
- shift
- platform_do_upgrade_trx "$trx" "$@"
-}
-
-platform_do_upgrade_trx() {
- local flash_type=$(platform_flash_type)
-
- case "$flash_type" in
- "serial")
- default_do_upgrade "$@"
- ;;
- "nand")
- echo "Firmware upgrade on NAND devices is REALLY unsupported."
- ;;
- esac
+platform_extract_trx_from_cybertan() {
+ dd if="$1" of="$2" bs=32 skip=1
}
platform_do_upgrade() {
local file_type=$(platform_identify "$1")
+ local trx="$1"
+
+ [ "$(platform_flash_type)" == "nand" ] && {
+ echo "Firmware upgrade on NAND devices is REALLY unsupported."
+ return
+ }
case "$file_type" in
- "chk") platform_do_upgrade_chk "$ARGV";;
- "cybertan") platform_do_upgrade_cybertan "$ARGV";;
- *) platform_do_upgrade_trx "$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" "$@"
}