From patchwork Sun Nov 28 10:54:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1560857 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=mM4f5/TQ; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=MbL55tWm; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J25Bk3bgWz9sRK for ; Sun, 28 Nov 2021 22:01:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=3sUpUCIwqk5G/TmOW7+YDcdgBKLkHRtZYV153EVsMO0=; b=mM4f5/TQ2WTmx1 UheztATUAZBnEhPWGwu4XGxoZtdgbNy0LgeuyE+9E+yK8WwggEJt+5HDTafDtLZkAvIVkqKh0xBLK 77GislSoegH3BnxB81MgDRX8mzlOwVgZUTTifz8dX4wZ9Qs7cDMCXske/PfiNn2m/JmVMlNSABqoR XkrXIK1YEEvJM/xR96TWUjzadkddt/D5ESrg+cXuQMhxNnGy7ZpuQzrdR6B6M9nnakAcJRbvCYF6i onjquqvfHaM45rCM9XUR2ICzHhBxtzd1Z1bmTrvdD2W6n4LUONCAE2CAyMaF+AVn0SxBz416xXqPl PpSxgMSwZq5gxK4TkN5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrHpI-00FVJS-Ei; Sun, 28 Nov 2021 10:54:32 +0000 Received: from mail-lf1-x12c.google.com ([2a00:1450:4864:20::12c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrHpB-00FVIg-MM for openwrt-devel@lists.openwrt.org; Sun, 28 Nov 2021 10:54:27 +0000 Received: by mail-lf1-x12c.google.com with SMTP id c32so36673981lfv.4 for ; Sun, 28 Nov 2021 02:54:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uiWV9zKLMWMQf7o3ODBv8tplwg0zgbLMaWgNXhfRhzo=; b=MbL55tWmmKYH7hflp5tutFQvHolyrQVD/cbDr3TulfrMAxxTvkJdWqeGHrz791sHXE Qok/OYxlerP7wL0vBbaQ/Sp3jlLI5vrUxZRApF1VAi51goxXivQnSqZhVHHr0IlMEuLZ IBJIyUfiOBUwz7RyzOkzsegkV5r3Ih3bKxu5/Dyikm4mV7f4zQsCqkDlqADcp/V1R/8o UosVHU5OtbKQ1knTYRynY5O9VF18U6BDSrMYKcS7rBq2rSxXyJ6Lm45j0vNThczBo9fX F7JQ6acfjUyJBJZ0JYeJJKgZBUISrUFebwMKnxnw2AyjM3yLoEWMay0LINsswX36Eox1 3y/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uiWV9zKLMWMQf7o3ODBv8tplwg0zgbLMaWgNXhfRhzo=; b=tkIqRoVGPfCADqdfysGSmY0/GTuBnZ3bfa19wnsG3/lS+dhj6B5UvGIyvLUKqMNcl9 tBKtfruJLm+cSgUTF73AdccwirEG/npsS4Ga76ZGvEMd8ho+s3EwubYGRwxmcAl/HK3U fvaYUk+0jn5+CplI4iDrhzti2Ho7zUEXPjbI8s4L2Q3MuH4PcJA4jSjntHqllTRRezmw HMIp7iHazeiZkh3kieF0uZZajxGCzBFEFli7FnzIDy631FhEIHAaR68gdLySosvpov4Y F/WDY4RGE0q7JHodGA8PEbpPmxXGwvgBl7bAX2A+rlvkvNDW0tBhJxwB0L9y5jMQawiA lLRg== X-Gm-Message-State: AOAM532pYTSvfn/Wz0NX7fmIGiirW6aoy4sq3iUsvwvwrLatWiDK9jlD Jmtpvp4YAWc27h5YChntIkUDmAv0InE= X-Google-Smtp-Source: ABdhPJykpGDPsvFN527mhiR0HmxbYMZfhxkLzkL2vS2FjaKOTz2QG0Z8IsY1AiICACKsK+ONBeLIjw== X-Received: by 2002:a05:6512:230e:: with SMTP id o14mr42191991lfu.490.1638096863915; Sun, 28 Nov 2021 02:54:23 -0800 (PST) Received: from localhost.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id bp15sm957707lfb.176.2021.11.28.02.54.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Nov 2021 02:54:23 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Subject: [PATCH] bcm53xx: sysupgrade: refactor handling different firmware formats Date: Sun, 28 Nov 2021 11:54:19 +0100 Message-Id: <20211128105419.27565-1-zajec5@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211128_025425_793114_6CC244D3 X-CRM114-Status: GOOD ( 15.51 ) X-Spam-Score: 0.1 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Rafa=C5=82_Mi=C5=82ecki_List_o?= =?unknown-8bit?q?f_supported_formats_grew_over?= =?unknown-8bit?q?_time_and_implementation_got_a_bit_messy=2E_There_are_multi?= =?unknown-8bit?q?ple_functions_with?= =?unknown-8bit?q?_format-specific_parameters_and_commands=2E_Refactor_it_by_?= =?unknown-8bit?q?making_platform=5Fidentify=28=29?= =?unknown-8bit?q?_setup_all_required_info_right_after_detecting_firmware_for?= =?unknown-8bit?q?mat=2E_This_simplifies?= =?unknown-8bit?q?_formats_handling_in_platform=5Fother=5Fcheck=5Fimage=28=29?= =?unknown-8bit?q?_and_platform=5Fdo=5Fupgrade=28=29?= =?unknown-8bit?b?IGEgbG8gWy4uLl0g?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E1_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail?= =?unknown-8bit?q?_provider?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E2_FREEMAIL=5FENVFROM=5FEND=5FDIGIT_Envelope-from_freem?= =?unknown-8bit?q?ail_username_ends?= =?unknown-8bit?q?_in_digit?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_no_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDoxMmMgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki List of supported formats grew over time and implementation got a bit messy. There are multiple functions with format-specific parameters and commands. Refactor it by making platform_identify() setup all required info right after detecting firmware format. This simplifies formats handling in platform_other_check_image() and platform_do_upgrade() a lot. This has been tested on: 1. SmartRG SR400ac (TRX): non-NAND sysupgrade 2. Netgear R8000 (CHK): NAND aware and standard sysupgrade-s 3. D-Link DIR-885L (Seama): NAND aware and standard sysupgrade-s 4. Luxul XWR-3150 (LXL): NAND aware and standard sysupgrade-s Signed-off-by: Rafał Miłecki --- .../base-files/lib/upgrade/platform.sh | 288 ++++++++---------- 1 file changed, 123 insertions(+), 165 deletions(-) diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh index 0973e4048b..512dad1891 100644 --- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh @@ -2,6 +2,12 @@ RAMFS_COPY_BIN='osafeloader oseama otrx truncate' PART_NAME=firmware +BCM53XX_FW_FORMAT= +BCM53XX_FW_BOARD_ID= +BCM53XX_FW_INT_IMG_FORMAT= +BCM53XX_FW_INT_IMG_TRX_OFFSET= +BCM53XX_FW_INT_IMG_EXTRACT_CMD= + LXL_FLAGS_VENDOR_LUXUL=0x00000001 # $(1): file to read magic from @@ -30,7 +36,7 @@ platform_expected_image() { local machine=$(board_name) case "$machine" in - "dlink,dir-885l") echo "seama wrgac42_dlink.2015_dir885l"; return;; + "dlink,dir-885l") echo "seamaseal wrgac42_dlink.2015_dir885l"; return;; "luxul,abr-4500-v1") echo "lxl ABR-4500"; return;; "luxul,xap-810-v1") echo "lxl XAP-810"; return;; "luxul,xap-1410v1") echo "lxl XAP-1410"; return;; @@ -59,169 +65,126 @@ platform_identify() { magic=$(get_magic_long "$1") case "$magic" in "48445230") - echo "trx" + BCM53XX_FW_FORMAT="trx" return ;; "2a23245e") - echo "chk" + local header_len=$((0x$(get_magic_long_at "$1" 4))) + local board_id_len=$(($header_len - 40)) + + BCM53XX_FW_FORMAT="chk" + BCM53XX_FW_BOARD_ID=$(dd if="$1" skip=40 bs=1 count=$board_id_len 2>/dev/null | hexdump -v -e '1/1 "%c"') + BCM53XX_FW_INT_IMG_FORMAT="trx" + BCM53XX_FW_INT_IMG_TRX_OFFSET="$header_len" + BCM53XX_FW_INT_IMG_EXTRACT_CMD="dd skip=$header_len iflag=skip_bytes" return ;; "4c584c23") - echo "lxl" + local hdr_len=$(get_le_long_at "$1" 8) + local flags=$(get_le_long_at "$1" 12) + + [ $((flags & LXL_FLAGS_VENDOR_LUXUL)) -gt 0 ] && notify_firmware_no_backup + + BCM53XX_FW_FORMAT="lxl" + BCM53XX_FW_BOARD_ID=$(dd if="$1" skip=16 bs=1 count=16 2>/dev/null | hexdump -v -e '1/1 "%c"') + BCM53XX_FW_INT_IMG_FORMAT="trx" + BCM53XX_FW_INT_IMG_TRX_OFFSET="$hdr_len" + BCM53XX_FW_INT_IMG_EXTRACT_CMD="dd skip=$hdr_len iflag=skip_bytes" + return ;; "5ea3a417") - echo "seama" + BCM53XX_FW_FORMAT="seamaseal" + BCM53XX_FW_BOARD_ID=$(oseama info "$1" | grep "Meta entry:.*signature=" | sed "s/.*=//") + BCM53XX_FW_INT_IMG_EXTRACT_CMD="oseama extract - -e 0" return ;; esac magic=$(get_magic_long_at "$1" 14) [ "$magic" = "55324e44" ] && { - echo "cybertan" + BCM53XX_FW_FORMAT="cybertan" + BCM53XX_FW_BOARD_ID=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"') + BCM53XX_FW_INT_IMG_FORMAT="trx" + BCM53XX_FW_INT_IMG_TRX_OFFSET="32" + BCM53XX_FW_INT_IMG_EXTRACT_CMD="dd skip=32 iflag=skip_bytes" return } magic=$(get_magic_long_at "$1" 60) [ "$magic" = "4c584c23" ] && { - echo "lxlold" + notify_firmware_no_backup + + BCM53XX_FW_FORMAT="lxlold" + BCM53XX_FW_BOARD_ID=$(dd if="$1" skip=48 bs=1 count=12 2>/dev/null | hexdump -v -e '1/1 "%c"') + BCM53XX_FW_INT_IMG_FORMAT="trx" + BCM53XX_FW_INT_IMG_TRX_OFFSET="64" + BCM53XX_FW_INT_IMG_EXTRACT_CMD="dd skip=64 iflag=skip_bytes" return } if osafeloader info "$1" > /dev/null 2>&1; then - echo "safeloader" + BCM53XX_FW_FORMAT="safeloader" return fi - - echo "unknown" } platform_other_check_image() { [ "$#" -gt 1 ] && return 1 - local file_type=$(platform_identify "$1") - local magic local error=0 - case "$file_type" in - "chk") - local header_len=$((0x$(get_magic_long_at "$1" 4))) - local board_id_len=$(($header_len - 40)) - local board_id=$(dd if="$1" skip=40 bs=1 count=$board_id_len 2>/dev/null | hexdump -v -e '1/1 "%c"') - local dev_board_id=$(platform_expected_image) - echo "Found CHK image with device board_id $board_id" - - [ -n "$dev_board_id" -a "chk $board_id" != "$dev_board_id" ] && { - echo "Firmware board_id doesn't match device board_id ($dev_board_id)" - error=1 - } - - if ! otrx check "$1" -o "$header_len"; then - echo "No valid TRX firmware in the CHK image" - notify_firmware_test_result "trx_valid" 0 - error=1 - else - notify_firmware_test_result "trx_valid" 1 - fi - ;; - "cybertan") - local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"') - local dev_pattern=$(platform_expected_image) - echo "Found CyberTAN image with device pattern: $pattern" - - [ -n "$dev_pattern" -a "cybertan $pattern" != "$dev_pattern" ] && { - echo "Firmware pattern doesn't match device pattern ($dev_pattern)" - error=1 - } - - if ! otrx check "$1" -o 32; then - echo "No valid TRX firmware in the CyberTAN image" - notify_firmware_test_result "trx_valid" 0 - error=1 - else - notify_firmware_test_result "trx_valid" 1 - fi - ;; - "lxl") - local hdr_len=$(get_le_long_at "$1" 8) - local flags=$(get_le_long_at "$1" 12) - local board=$(dd if="$1" skip=16 bs=1 count=16 2>/dev/null | hexdump -v -e '1/1 "%c"') - local dev_board=$(platform_expected_image) - echo "Found LXL image for board $board" - - [ -n "$dev_board" -a "lxl $board" != "$dev_board" ] && { - echo "Firmware ($board) doesn't match device ($dev_board)" - error=1 - } - - [ $((flags & LXL_FLAGS_VENDOR_LUXUL)) -gt 0 ] && notify_firmware_no_backup + platform_identify "$1" + [ -z "$BCM53XX_FW_FORMAT" ] && { + echo "Invalid image type. Please use firmware specific for this device." + notify_firmware_broken + return 1 + } + echo "Found $BCM53XX_FW_FORMAT firmware for device $BCM53XX_FW_BOARD_ID" - if ! otrx check "$1" -o "$hdr_len"; then - echo "No valid TRX firmware in the LXL image" - notify_firmware_test_result "trx_valid" 0 - error=1 - else - notify_firmware_test_result "trx_valid" 1 - fi - ;; - "lxlold") - local board_id=$(dd if="$1" skip=48 bs=1 count=12 2>/dev/null | hexdump -v -e '1/1 "%c"') - local dev_board_id=$(platform_expected_image) - echo "Found LXL image with device board_id $board_id" + local expected_image="$(platform_expected_image)" + [ -n "$expected_image" -a -n "$BCM53XX_FW_BOARD_ID" -a "$expected_image" != "$BCM53XX_FW_FORMAT $BCM53XX_FW_BOARD_ID" ] && { + echo "Firmware doesn't match device ($expected_image)" + error=1 + } - [ -n "$dev_board_id" -a "lxl $board_id" != "$dev_board_id" ] && { - echo "Firmware board_id doesn't match device board_id ($dev_board_id)" + case "$BCM53XX_FW_FORMAT" in + "seamaseal") + $(oseama info "$1" -e 0 | grep -q "Meta entry:.*type=firmware") || { + echo "Seama seal doesn't contain firmware entity" error=1 } - - notify_firmware_no_backup - - if ! otrx check "$1" -o 64; then - echo "No valid TRX firmware in the Luxul image" + ;; + "trx") + if ! otrx check "$1"; then + echo "Failed to find a valid TRX in firmware" notify_firmware_test_result "trx_valid" 0 error=1 else notify_firmware_test_result "trx_valid" 1 fi - ;; - "safeloader") - ;; - "seama") - local img_signature=$(oseama info "$1" | grep "Meta entry:.*signature=" | sed "s/.*=//") - local dev_signature=$(platform_expected_image) - echo "Found Seama image with device signature: $img_signature" - - [ -n "$dev_signature" -a "seama $img_signature" != "$dev_signature" ] && { - echo "Firmware signature doesn't match device signature ($dev_signature)" - error=1 - } - $(oseama info "$1" -e 0 | grep -q "Meta entry:.*type=firmware") || { - echo "Seama container doesn't have firmware entity" - error=1 - } - ;; - "trx") - local expected=$(platform_expected_image) - - [ "$expected" == "safeloader" ] && { + [ "$expected_image" == "safeloader" ] && { echo "This device expects SafeLoader format and may not work with TRX" error=1 } - - if ! otrx check "$1"; then - echo "Invalid (corrupted?) TRX firmware" - notify_firmware_test_result "trx_valid" 0 - error=1 - else - notify_firmware_test_result "trx_valid" 1 - fi - ;; + ;; *) - echo "Invalid image type. Please use firmware specific for this device." - notify_firmware_broken - error=1 - ;; + case "$BCM53XX_FW_INT_IMG_FORMAT" in + "trx") + # Make sure that both ways of extracting TRX work. + # platform_do_upgrade() may use any of them. + if ! otrx check "$1" -o "$BCM53XX_FW_INT_IMG_TRX_OFFSET" || \ + ! $BCM53XX_FW_INT_IMG_EXTRACT_CMD < $1 | otrx check -; then + echo "Invalid (corrupted?) TRX firmware" + notify_firmware_test_result "trx_valid" 0 + error=1 + else + notify_firmware_test_result "trx_valid" 1 + fi + ;; + esac + ;; esac return $error @@ -246,8 +209,8 @@ platform_check_image() { } -# $(1): image for upgrade (with possible extra header) -# $(2): offset of trx in image +# $(1): TRX image or firmware containing TRX +# $(2): offset of TRX in firmware (optional) platform_do_upgrade_nand_trx() { local dir="/tmp/sysupgrade-bcm53xx" local trx="$1" @@ -311,15 +274,15 @@ platform_do_upgrade_nand_trx() { nand_do_upgrade $dir/root } -platform_do_upgrade_nand_seama() { +platform_do_upgrade_nand_seamaseal() { local dir="/tmp/sysupgrade-bcm53xx" - local seama="$1" + local seamaseal="$1" local tmp # Extract Seama entity from Seama seal rm -fR $dir mkdir -p $dir - oseama extract "$seama" \ + oseama extract "$seamaseal" \ -e 0 \ -o $dir/seama.entity [ $? -ne 0 ] && { @@ -358,26 +321,6 @@ platform_do_upgrade_nand_seama() { nand_do_upgrade $dir/root.ubi } -platform_trx_from_chk_cmd() { - local header_len=$((0x$(get_magic_long_at "$1" 4))) - - echo -n dd skip=$header_len iflag=skip_bytes -} - -platform_trx_from_cybertan_cmd() { - echo -n dd skip=32 iflag=skip_bytes -} - -platform_trx_from_lxl_cmd() { - local hdr_len=$(get_le_long_at "$1" 8) - - echo -n dd skip=$hdr_len iflag=skip_bytes -} - -platform_trx_from_lxlold_cmd() { - echo -n dd bs=64 skip=1 -} - platform_img_from_safeloader() { local dir="/tmp/sysupgrade-bcm53xx" @@ -396,23 +339,28 @@ platform_img_from_safeloader() { echo -n $dir/os-image } -platform_img_from_seama_cmd() { - echo -n oseama extract "$1" -e 0 -} - platform_other_do_upgrade() { - local file_type=$(platform_identify "$1") - local trx="$1" - local cmd= + platform_identify "$1" [ "$(platform_flash_type)" == "nand" ] && { - case "$file_type" in - "chk") platform_do_upgrade_nand_trx "$1" $((0x$(get_magic_long_at "$1" 4)));; - "cybertan") platform_do_upgrade_nand_trx "$1" 32;; - "lxl") platform_do_upgrade_nand_trx "$1" $(get_le_long_at "$1" 8);; - "lxlold") platform_do_upgrade_nand_trx "$1" 64;; - "seama") platform_do_upgrade_nand_seama "$1";; - "trx") platform_do_upgrade_nand_trx "$1";; + # Try NAND-aware upgrade + case "$BCM53XX_FW_FORMAT" in + "seamaseal") + platform_do_upgrade_nand_seamaseal "$1" + ;; + "trx") + platform_do_upgrade_nand_trx "$1" + ;; + *) + case "$BCM53XX_FW_INT_IMG_FORMAT" in + "trx") + platform_do_upgrade_nand_trx "$1" "$BCM53XX_FW_INT_IMG_TRX_OFFSET" + ;; + *) + echo "NAND aware sysupgrade is unsupported for $BCM53XX_FW_FORMAT format" + ;; + esac + ;; esac # Above calls exit on success. @@ -420,16 +368,26 @@ platform_other_do_upgrade() { echo "Writing whole image to NAND flash. All erase counters will be lost." } - case "$file_type" in - "chk") cmd=$(platform_trx_from_chk_cmd "$trx");; - "cybertan") cmd=$(platform_trx_from_cybertan_cmd "$trx");; - "lxl") cmd=$(platform_trx_from_lxl_cmd "$trx");; - "lxlold") cmd=$(platform_trx_from_lxlold_cmd "$trx");; - "safeloader") trx=$(platform_img_from_safeloader "$trx"); PART_NAME=os-image;; - "seama") cmd=$(platform_img_from_seama_cmd "$trx");; + case "$BCM53XX_FW_FORMAT" in + "safeloader") + PART_NAME=os-image + img=$(platform_img_from_safeloader "$1") + default_do_upgrade "$img" + ;; + "seamaseal") + default_do_upgrade "$1" "$BCM53XX_FW_INT_IMG_EXTRACT_CMD" + ;; + "trx") + default_do_upgrade "$1" + ;; + *) + case "$BCM53XX_FW_INT_IMG_FORMAT" in + "trx") + default_do_upgrade "$1" "$BCM53XX_FW_INT_IMG_EXTRACT_CMD" + ;; + esac + ;; esac - - default_do_upgrade "$trx" "$cmd" } platform_do_upgrade() {