From patchwork Sat May 13 19:56:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 762069 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wQHhr1RcKz9s9Y for ; Sun, 14 May 2017 05:58:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZWimiV5w"; dkim-atps=neutral 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:References: In-Reply-To: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:List-Owner; bh=t2ipIDTDJ4ELD+SZSni8mMrhPN9ZJLPR9p/VASVlBk4=; b=ZWimiV5wKDQ9VpHkWELLQzyUa7 KEftTkhpziLeOOTlNAMl2lxeL204/YxpiScbL40cWgdCcPwaz2wSs5JqB/KVKKUkygX3HymZeLLft G8+xSzygIfjzkc5iW4pf2R7tZqvF90z8one7n6sTAidY55E/Ts7zFMt4jx8iFeCiTRbsBW33uqvFG zvhfA3W1uufLJ0Sj735hD0TaNES2MqMDJoo7L634QVzFep2tLfOEiELaLyV6F4e9Rk7OVV4w+FD2B j/ry5FB22ck9KiiehurIOM6GI5qsvEfEed24BEpqtIIarqiBkFKoPfixB448Dl5SXgarqICJSE8ko i6amSIZw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d9dBP-0005It-9O; Sat, 13 May 2017 19:58:31 +0000 Received: from chaos.universe-factory.net ([37.72.148.22]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d9dAd-0003rj-Sv for lede-dev@lists.infradead.org; Sat, 13 May 2017 19:57:52 +0000 Received: from localhost.localdomain (unknown [IPv6:fd1b:c28a:2fd6::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by chaos.universe-factory.net (Postfix) with ESMTPSA id DF367186C9D for ; Sat, 13 May 2017 21:56:57 +0200 (CEST) From: Matthias Schiffer To: lede-dev@lists.infradead.org Date: Sat, 13 May 2017 21:56:44 +0200 Message-Id: X-Mailer: git-send-email 2.13.0 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170513_125745_203840_BCA50A13 X-CRM114-Status: UNSURE ( 6.27 ) 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 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH v2 14/19] ramips: sysupgrade: 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 All targets with NAND support should gradually move their nand_do_upgrade calls from platform_pre_upgrade to platform_do_upgrade. Signed-off-by: Matthias Schiffer --- target/linux/ramips/base-files/lib/upgrade/platform.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 32bc453497..5df16f21ce 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -279,7 +279,7 @@ platform_nand_pre_upgrade() { esac } -platform_pre_upgrade() { +platform_do_upgrade() { local board=$(ramips_board_name) case "$board" in @@ -288,13 +288,6 @@ platform_pre_upgrade() { ubnt-erx) nand_do_upgrade "$ARGV" ;; - esac -} - -platform_do_upgrade() { - local board=$(ramips_board_name) - - case "$board" in *) default_do_upgrade "$ARGV" ;;