ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-21 17:47:00 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

bcm53xx: rework vendor fw handling to don't duplicate upgrade calls

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

SVN-Revision: 45389
This commit is contained in:
Rafał Miłecki 2015-04-12 10:42:27 +00:00
parent 8904cd1dcc
commit a04b71d330
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
View File

@ -114,44 +114,30 @@ platform_check_image() {
return $error return $error
} }
# Extract TRX and use stadard upgrade method platform_extract_trx_from_chk() {
platform_do_upgrade_chk() {
local header_len=$((0x$(get_magic_long_at "$1" 4))) 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 dd if="$1" of="$2" bs=$header_len skip=1
shift
platform_do_upgrade_trx "$trx" "$@"
} }
# Extract TRX and use stadard upgrade method platform_extract_trx_from_cybertan() {
platform_do_upgrade_cybertan() { dd if="$1" of="$2" bs=32 skip=1
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_do_upgrade() { platform_do_upgrade() {
local file_type=$(platform_identify "$1") 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 case "$file_type" in
"chk") platform_do_upgrade_chk "$ARGV";; "chk") trx="/tmp/$1.trx"; platform_extract_trx_from_chk "$1" "$trx";;
"cybertan") platform_do_upgrade_cybertan "$ARGV";; "cybertan") trx="/tmp/$1.trx"; platform_extract_trx_from_cybertan "$1" "$trx";;
*) platform_do_upgrade_trx "$ARGV";;
esac esac
shift
default_do_upgrade "$trx" "$@"
} }