brcm47xx: extract TRX from image on the fly

Extracting TRX to separated file in /tmp/ requires extra RAM which may
not be available on some chepaer devices. Instead of that lets pass a
proper extracting command to the default_do_upgrade.

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

SVN-Revision: 45901
This commit is contained in:
John Crispin 2015-06-05 14:12:15 +00:00
parent f57076956e
commit 0da6f8a52b

View File

@ -133,25 +133,26 @@ platform_check_image() {
return $error return $error
} }
platform_extract_trx_from_chk() { platform_trx_from_chk_cmd() {
local header_len=$((0x$(get_magic_long_at "$1" 4))) local header_len=$((0x$(get_magic_long_at "$1" 4)))
dd if="$1" of="$2" bs=$header_len skip=1 echo -n dd bs=$header_len skip=1
} }
platform_extract_trx_from_cybertan() { platform_trx_from_cybertan_cmd() {
dd if="$1" of="$2" bs=32 skip=1 echo -n dd bs=32 skip=1
} }
platform_do_upgrade() { platform_do_upgrade() {
local file_type=$(brcm47xx_identify "$1") local file_type=$(brcm47xx_identify "$1")
local trx="$1" local trx="$1"
local cmd=""
case "$file_type" in case "$file_type" in
"chk") trx="/tmp/$(basename $1).trx"; platform_extract_trx_from_chk "$1" "$trx";; "chk") cmd=$(platform_trx_from_chk_cmd "$trx");;
"cybertan") trx="/tmp/$(basename $1).trx"; platform_extract_trx_from_cybertan "$1" "$trx";; "cybertan") cmd=$(platform_trx_from_cybertan_cmd "$trx");;
esac esac
shift shift
default_do_upgrade "$trx" "$@" default_do_upgrade "$trx" "$cmd"
} }