KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bcm53xx: extract TRX from image on the fly

Browse source 
Extracting TRX to separated file in /tmp/ just wastes some RAM while we
can just pass a proper extracting command to the default_do_upgrade.

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

SVN-Revision: 45912
This commit is contained in:
Rafał Miłecki 2015-06-06 17:23:03 +00:00
parent 5e90144aec
commit 54fb91f0cf
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
View file

@ -109,16 +109,6 @@ platform_check_image() {
return $error return $error
} }
platform_extract_trx_from_chk() {
local header_len=$((0x$(get_magic_long_at "$1" 4)))
dd if="$1" of="$2" bs=$header_len skip=1
}
platform_extract_trx_from_cybertan() {
dd if="$1" of="$2" bs=32 skip=1
}
platform_pre_upgrade() { platform_pre_upgrade() {
local file_type=$(platform_identify "$1") local file_type=$(platform_identify "$1")
local dir="/tmp/sysupgrade-bcm53xx" local dir="/tmp/sysupgrade-bcm53xx"
@ -179,19 +169,30 @@ platform_pre_upgrade() {
nand_do_upgrade /tmp/root.ubi nand_do_upgrade /tmp/root.ubi
} }
platform_trx_from_chk_cmd() {
local header_len=$((0x$(get_magic_long_at "$1" 4)))
echo -n dd bs=$header_len skip=1
}
platform_trx_from_cybertan_cmd() {
echo -n dd bs=32 skip=1
}
platform_do_upgrade() { platform_do_upgrade() {
local file_type=$(platform_identify "$1") local file_type=$(platform_identify "$1")
local trx="$1" local trx="$1"
local cmd=
[ "$(platform_flash_type)" == "nand" ] && { [ "$(platform_flash_type)" == "nand" ] && {
echo "Writing whole image to NAND flash. All erase counters will be lost." echo "Writing whole image to NAND flash. All erase counters will be lost."
} }
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"
} }