hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

SVN-Revision: 45470
lede-17.01
Rafał Miłecki 2015-04-16 21:43:27 +00:00
parent c8eed9a50a
commit e85294a957
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
View File

@ -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" "$@"
}