From: Rafał Miłecki <zajec5@gmail.com>
Date: Sat, 6 Jun 2015 17:23:03 +0000 (+0000)
Subject: bcm53xx: extract TRX from image on the fly
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=54fb91f0cf8c93d3e306cb121d7657b0e04403a6;p=librecmc%2Flibrecmc.git

bcm53xx: extract TRX from image on the fly

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
---

diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index 4920b55caf..7251a9a417 100644
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -109,16 +109,6 @@ platform_check_image() {
 	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() {
 	local file_type=$(platform_identify "$1")
 	local dir="/tmp/sysupgrade-bcm53xx"
@@ -179,19 +169,30 @@ platform_pre_upgrade() {
 	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() {
 	local file_type=$(platform_identify "$1")
 	local trx="$1"
+	local cmd=
 
 	[ "$(platform_flash_type)" == "nand" ] && {
 		echo "Writing whole image to NAND flash. All erase counters will be lost."
 	}
 
 	case "$file_type" in
-		"chk")		trx="/tmp/$(basename $1).trx"; platform_extract_trx_from_chk "$1" "$trx";;
-		"cybertan")	trx="/tmp/$(basename $1).trx"; platform_extract_trx_from_cybertan "$1" "$trx";;
+		"chk")		cmd=$(platform_trx_from_chk_cmd "$trx");;
+		"cybertan")	cmd=$(platform_trx_from_cybertan_cmd "$trx");;
 	esac
 
 	shift
-	default_do_upgrade "$trx" "$@"
+	default_do_upgrade "$trx" "$cmd"
 }