From 24d40980b0822dff89d8ae75eedd85fa98df2cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Sun, 12 Apr 2015 11:46:16 +0000 Subject: [PATCH] bcm53xx: add platform_pre_upgrade to prepare for kernel+UBI sysupgrade MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can now detect that provided firmware contains kernel and UBI image partitions. Flashing it in a sane way (keeping erase counters) still needs to be implemented. Signed-off-by: Rafał Miłecki SVN-Revision: 45391 --- .../base-files/lib/upgrade/platform.sh | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh index c3f9a14c78d..26a32e30a4c 100644 --- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh @@ -124,6 +124,34 @@ 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" + local trx="$1" + + [ "$(platform_flash_type)" != "nand" ] && return + + # Extract trx + case "$file_type" in + "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 + + # Extract partitions from trx + rm -fR $dir + mkdir -p $dir + otrx -e "$trx" \ + -1 $dir/kernel \ + -2 $dir/root + + # Firmwares without UBI image should be flashed "normally" + local root_type=$(identify $dir/root) + [ "$root_type" != "ubi" ] && return + + echo "Provided firmware contains kernel and UBI image, but flashing it in unsupported yet" + exit 1 +} + platform_do_upgrade() { local file_type=$(platform_identify "$1") local trx="$1"