From patchwork Wed Dec 27 11:02:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathias Kresin X-Patchwork-Id: 853128 X-Patchwork-Delegate: openwrt@kresin.me Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="teQb6ZMp"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=kresin-me.20150623.gappssmtp.com header.i=@kresin-me.20150623.gappssmtp.com header.b="mYB5JDlM"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z692x15jVz9s7s for ; Wed, 27 Dec 2017 22:04:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=aQNzt4oUMmrmfxOnfM7/s8wlNivfJAn2LqnOHT8Q3xE=; b=teQb6ZMpbFtm8l 8IBd+G1DYuhdbE8xNut2PwIKFu6fnCrjQfxV/4fvcJUM5YqcYQvjWwgVt/g3e4YtE1p4IlWVqU55z v5CcbJx1zIyG9lgKkb3ZNWsdZW4JSh0roKmWlFYTk9j1mhP4NACbCrgpjzPCfVKZM40BnvHlJnGmV M6tEqucWfnH6Wq3IfgYKEaIUdDJHPW4uRm1ZMx4O+dh+EI2WJxF/8rSQcrJyOIXwfJzOYnIOd7/iV ywI7VKewqEWcNppRmgib/hlo2SlV4XrmpYHkisD0gvTpKTafDpbYATIVPaBpzqh31hjvd8+SHWtmD 8rb0iwaPb0QUDFfaEmsQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eU9V6-00045O-Nx; Wed, 27 Dec 2017 11:03:56 +0000 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eU9Ui-0003mf-0C for lede-dev@lists.infradead.org; Wed, 27 Dec 2017 11:03:34 +0000 Received: by mail-wr0-x243.google.com with SMTP id l41so24265379wre.11 for ; Wed, 27 Dec 2017 03:03:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kresin-me.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=AumKMpDSw85bpbjzmnLpKcIMPy4bjk0tHwfCp2lzzrE=; b=mYB5JDlMRhXFsbx4sXflpKkhdJl/own7eUvQEuRb0rU3HHDPh5iKbhMpfljdTfE90Z UJYb2zACXkf22zLUMNMMxIa9y54bwaVkcNcPlflxlzHbfrWVd546JYBzvprp3im1tQxs ZIG7kTUG6DUB7YIG3d1Fjcdivtw7BIviHnHd1dBqsHC9CS6TEjQAtTZDTgXQ9KRKpGLF ZxHKIzBJiM6dxydQD2+LiRd1GLHEvcrPypNIWFN4s2wB2uUHTwHzQIc4wkx20mZ/kRJv re9Svfv3D9VPhZY+2kc/BlZPCitcnvwmkqtZQVDifuAAng+1GXpFv2QJj1BfSEtvE+YG vQ5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=AumKMpDSw85bpbjzmnLpKcIMPy4bjk0tHwfCp2lzzrE=; b=ekYNC1LFVIScuMTzighTYpOsupcioTDuH5iiqEz1LgZeke1bwLR5vCmP87aNXUYcFR WPK9un37inM2d2z1NZ+MGCzoJ4Nqc75fGNp+uW9l4jGx2zC6D9lfQ5fNT+OdYtQsvzcF Gz5Pq7cAvHUQujMCC/XE47ZgZaMOma0/zX+tMEqb+Dp1YdqZLciemI40VO4YyuHWH1gT c/SnMaJ5Su62GPj54K9kvSJhDqGZrV7xSRvAbOKi8riAYuxR/u3BRLkwzgGBKBH8qYbM /rE+lTmjuh3xhcvqxrzVKXULHJEK9DJym00noYlPCXTLSJEUwZed/qaItfeQ4l9Zo7tV GeGw== X-Gm-Message-State: AKGB3mL6hev7YhqVP6jNxAns299qlHBztqbv22vv6CpdiNg3qbWaQyfN Vwf6n2OEkxe8R4YZFO4xMs6PRfD6 X-Google-Smtp-Source: ACJfBovyW353jwKqA6Z5JP+1SJ4SR2G/uew9UMIyiSe/RSOeXqYOx8GDZpgQx3u4Shwns/tGp84hPA== X-Received: by 10.223.164.200 with SMTP id h8mr30012757wrb.227.1514372599462; Wed, 27 Dec 2017 03:03:19 -0800 (PST) Received: from desktop.wvd.kresin.me (p2003008C2F241F10F1354A3912861EA1.dip0.t-ipconnect.de. [2003:8c:2f24:1f10:f135:4a39:1286:1ea1]) by smtp.gmail.com with ESMTPSA id u33sm45706585wrf.42.2017.12.27.03.03.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Dec 2017 03:03:19 -0800 (PST) From: Mathias Kresin To: lede-dev@lists.infradead.org Date: Wed, 27 Dec 2017 12:02:24 +0100 Message-Id: <1514372544-12622-1-git-send-email-dev@kresin.me> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171227_030332_058546_7B8F24A1 X-CRM114-Status: UNSURE ( 9.85 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c0c:0:0:0:243 listed in] [list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH] treewide: move nand_do_upgrade call to platform_do_upgrade X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Calling nand_do_upgrade() from platform_pre_upgrade() was deprecated with 30f61a34b4cf ("base-files: always use staged sysupgrade"). Update the platform upgrade code to use platform_do_upgrade() for NAND images as well. Signed-off-by: Mathias Kresin --- .../apm821xx/base-files/lib/upgrade/platform.sh | 21 ++---- .../ar71xx/base-files/lib/upgrade/platform.sh | 86 +++++++++++----------- .../linux/imx6/base-files/lib/upgrade/platform.sh | 2 +- .../lantiq/base-files/lib/upgrade/platform.sh | 7 +- .../mediatek/base-files/lib/upgrade/platform.sh | 27 ++++--- .../linux/oxnas/base-files/lib/upgrade/platform.sh | 2 +- .../pistachio/base-files/lib/upgrade/platform.sh | 2 +- .../linux/rb532/base-files/lib/upgrade/platform.sh | 6 +- 8 files changed, 69 insertions(+), 84 deletions(-) diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh index a45af7d..ced8ce1 100755 --- a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh @@ -18,21 +18,6 @@ platform_check_image() { esac } -platform_pre_upgrade() { - local board=$(board_name) - - case "$board" in - meraki,mr24|\ - meraki,mx60|\ - netgear,wndr4700) - nand_do_upgrade "$1" - ;; - - *) - ;; - esac -} - platform_do_upgrade() { local board=$(board_name) @@ -41,7 +26,11 @@ platform_do_upgrade() { wd,mybooklive-duo) mbl_do_upgrade "$ARGV" ;; - + meraki,mr24|\ + meraki,mx60|\ + netgear,wndr4700) + nand_do_upgrade "$1" + ;; *) default_do_upgrade "$ARGV" ;; diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 35c6886..6f48294 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -675,45 +675,6 @@ platform_pre_upgrade() { local board=$(board_name) case "$board" in - c-60|\ - hiveap-121|\ - nbg6716|\ - r6100|\ - rambutan|\ - rb-411|\ - rb-411u|\ - rb-433|\ - rb-433u|\ - rb-435g|\ - rb-450|\ - rb-450g|\ - rb-493|\ - rb-493g|\ - rb-750|\ - rb-750gl|\ - rb-751|\ - rb-751g|\ - rb-911g-2hpnd|\ - rb-911g-5hpacd|\ - rb-911g-5hpnd|\ - rb-912uag-2hpnd|\ - rb-912uag-5hpnd|\ - rb-921gs-5hpacd-r2|\ - rb-951g-2hnd|\ - rb-951ui-2hnd|\ - rb-2011il|\ - rb-2011l|\ - rb-2011uas|\ - rb-2011uas-2hnd|\ - rb-2011uias|\ - rb-2011uias-2hnd|\ - rb-sxt2n|\ - rb-sxt5n|\ - wi2a-ac200i|\ - wndr3700v4|\ - wndr4300) - nand_do_upgrade "$1" - ;; rb-750-r2|\ rb-750p-pbr2|\ rb-750up-r2|\ @@ -728,10 +689,6 @@ platform_pre_upgrade() { # erase firmware if booted from initramfs [ -z "$(rootfs_type)" ] && mtd erase firmware ;; - mr18|\ - z1) - merakinand_do_upgrade "$1" - ;; esac } @@ -820,6 +777,49 @@ platform_do_upgrade() { om5p-an) platform_do_upgrade_openmesh "$ARGV" ;; + c-60|\ + hiveap-121|\ + nbg6716|\ + r6100|\ + rambutan|\ + rb-411|\ + rb-411u|\ + rb-433|\ + rb-433u|\ + rb-435g|\ + rb-450|\ + rb-450g|\ + rb-493|\ + rb-493g|\ + rb-750|\ + rb-750gl|\ + rb-751|\ + rb-751g|\ + rb-911g-2hpnd|\ + rb-911g-5hpacd|\ + rb-911g-5hpnd|\ + rb-912uag-2hpnd|\ + rb-912uag-5hpnd|\ + rb-921gs-5hpacd-r2 + rb-951g-2hnd|\ + rb-951ui-2hnd|\ + rb-2011il|\ + rb-2011l|\ + rb-2011uas|\ + rb-2011uas-2hnd|\ + rb-2011uias|\ + rb-2011uias-2hnd|\ + rb-sxt2n|\ + rb-sxt5n|\ + wi2a-ac200i|\ + wndr3700v4|\ + wndr4300) + nand_do_upgrade "$1" + ;; + mr18|\ + z1) + merakinand_do_upgrade "$1" + ;; uap-pro|\ unifi-outdoor-plus) MTD_CONFIG_ARGS="-s 0x180000" diff --git a/target/linux/imx6/base-files/lib/upgrade/platform.sh b/target/linux/imx6/base-files/lib/upgrade/platform.sh index a9ca5ee..ab52291 100755 --- a/target/linux/imx6/base-files/lib/upgrade/platform.sh +++ b/target/linux/imx6/base-files/lib/upgrade/platform.sh @@ -16,7 +16,7 @@ platform_check_image() { return 1 } -platform_pre_upgrade() { +platform_do_upgrade() { local board=$(board_name) case "$board" in diff --git a/target/linux/lantiq/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/base-files/lib/upgrade/platform.sh index 9755dc4..2e58cb7 100755 --- a/target/linux/lantiq/base-files/lib/upgrade/platform.sh +++ b/target/linux/lantiq/base-files/lib/upgrade/platform.sh @@ -5,14 +5,15 @@ platform_check_image() { return 0 } -platform_pre_upgrade() { +platform_do_upgrade() { local board=$(board_name) case "$board" in bt,homehub-v2b|bt,homehub-v3a|bt,homehub-v5a|zyxel,p-2812hnu-f1|zyxel,p-2812hnu-f3) nand_do_upgrade $1 ;; + *) + default_do_upgrade "$ARGV" + ;; esac } - -# use default for platform_do_upgrade() diff --git a/target/linux/mediatek/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/base-files/lib/upgrade/platform.sh index 7161a4b..29d936d 100755 --- a/target/linux/mediatek/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/base-files/lib/upgrade/platform.sh @@ -6,13 +6,21 @@ platform_do_upgrade() { local tar_file="$1" local board="$(board_name)" - echo "flashing kernel" - tar xf $tar_file sysupgrade-$board/kernel -O | mtd write - kernel + case "$(board_name)" in + mediatek,mt7623-rfb-nand-ephy |\ + mediatek,mt7623-rfb-nand) + nand_do_upgrade $1 + ;; + *) + echo "flashing kernel" + tar xf $tar_file sysupgrade-$board/kernel -O | mtd write - kernel - echo "flashing rootfs" - tar xf $tar_file sysupgrade-$board/root -O | mtd write - rootfs + echo "flashing rootfs" + tar xf $tar_file sysupgrade-$board/root -O | mtd write - rootfs - return 0 + return 0 + ;; + esac } platform_check_image() { @@ -44,12 +52,3 @@ platform_check_image() { return 0 } - -platform_pre_upgrade() { - case "$(board_name)" in - mediatek,mt7623-rfb-nand-ephy |\ - mediatek,mt7623-rfb-nand) - nand_do_upgrade $1 - ;; - esac -} diff --git a/target/linux/oxnas/base-files/lib/upgrade/platform.sh b/target/linux/oxnas/base-files/lib/upgrade/platform.sh index 8c2e347..059d75f 100644 --- a/target/linux/oxnas/base-files/lib/upgrade/platform.sh +++ b/target/linux/oxnas/base-files/lib/upgrade/platform.sh @@ -13,6 +13,6 @@ platform_check_image() { return $? } -platform_pre_upgrade() { +platform_do_upgrade() { nand_do_upgrade $1 } diff --git a/target/linux/pistachio/base-files/lib/upgrade/platform.sh b/target/linux/pistachio/base-files/lib/upgrade/platform.sh index 4edc06b..d7d2ba0 100755 --- a/target/linux/pistachio/base-files/lib/upgrade/platform.sh +++ b/target/linux/pistachio/base-files/lib/upgrade/platform.sh @@ -18,7 +18,7 @@ platform_check_image() return $? } -platform_pre_upgrade() { +platform_do_upgrade() { # TODO no need to switch to ramfs with dual partitions in # fact we don't even want to reboot as part of seamless # upgrades. Instead just upgrade opposite partition and mark diff --git a/target/linux/rb532/base-files/lib/upgrade/platform.sh b/target/linux/rb532/base-files/lib/upgrade/platform.sh index 2beccc5..a6a6e9b 100644 --- a/target/linux/rb532/base-files/lib/upgrade/platform.sh +++ b/target/linux/rb532/base-files/lib/upgrade/platform.sh @@ -10,15 +10,11 @@ platform_check_image() { return 0; } -platform_pre_upgrade() { - nand_do_upgrade "$1" -} - platform_nand_pre_upgrade() { mtd erase kernel tar xf "$1" "sysupgrade-$(board_name)/kernel" -O | nandwrite -o /dev/mtd0 - } platform_do_upgrade() { - default_do_upgrade "$ARGV" + nand_do_upgrade "$1" }