From patchwork Wed Apr 26 13:25:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1774108 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=hhTCttKQ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q605K17Jwz23vH for ; Wed, 26 Apr 2023 23:26:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 297938634D; Wed, 26 Apr 2023 15:26:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hhTCttKQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 98737862C5; Wed, 26 Apr 2023 15:25:58 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8D6408634D for ; Wed, 26 Apr 2023 15:25:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-ot1-x333.google.com with SMTP id 46e09a7af769-6a5f57c64ceso1157192a34.1 for ; Wed, 26 Apr 2023 06:25:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682515554; x=1685107554; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fn0UDcVMgSosMdd++VStEMsmdkwgcWZng/rRW5MA4c4=; b=hhTCttKQTlD0+SD48sPfyz9vrWWaRVjjVMe6xZDqrgplKPbBszHdoZU0toOUw+HRJT fiiCyVDd0VaSRSMrF6hWvrgvm/F01V3EaP07dX9dLePVNmk5eHsxNUCqs1si/oEel63k nWb25ZkaE1AC62lFT98YLl4PQfguz+fnM73wHSPs3EVz8SKyBOju/QcokbuGnuz7HnZ4 aDsq+CDzsYL4hdKjq0xmiL97fVoxbnCId97w8d1keagn2vV3xb2OyRXXT6wKrYYNnFLp URW6maRvc3bm3T3yEvQ8Xth2XJXoj63PmjtT6mvSn38vO9YOnGzkrKPz/cH6neaZMb3d UzTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682515554; x=1685107554; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fn0UDcVMgSosMdd++VStEMsmdkwgcWZng/rRW5MA4c4=; b=HbSfZmX0Ty6KyNwqbohZP/uQeK2cnCPZ/4R9qC8ebu4wKqckQxB2JsAafygShz70H4 2KaszC0fFMUFRajOXxVHa926sxPk+EzkJ+lHUF7DNGsxVHjf9CJEg5RcXmeCh6UOuuCA QeGT5H8D2TwpQIEW21Xvkp1EtUfBJwXQvr71iT6QOxg0PsHb1FYoDSMbqAta3I9IwccV PIYVebpMrvUzIHGKx/94uRkhghiR13Y/GER/aiw4uMjuxgTB4rBMznnalhi6G0yn94VO XwAd+bSqgOFAee/2Ayhx+6l9VzKppndJ/un7MMnB/PfklSXQqMmeUnX7rYFUk3u51Pi4 m3Og== X-Gm-Message-State: AAQBX9fwy/KrTQXURRIRyrOLsCMS4EntKjLL6V1Gm4BEuzWwDiw3H3Bf 1jvAQAiRld9DHMHTWpF0pEo= X-Google-Smtp-Source: AKy350bQ0sunMmGfaiXHnZoglG+ehonM2TEEca/mePqmGStcnlh8+6M3+vIjNN1PlpQnOfBdkYHYhQ== X-Received: by 2002:a9d:4e17:0:b0:6a6:2563:2dcb with SMTP id p23-20020a9d4e17000000b006a625632dcbmr2560861otf.3.1682515553973; Wed, 26 Apr 2023 06:25:53 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id h9-20020a056830164900b006a61bef7968sm6762384otr.53.2023.04.26.06.25.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 06:25:53 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v4 04/14] smegw01: Add altbootcmd Date: Wed, 26 Apr 2023 10:25:23 -0300 Message-Id: <20230426132533.1145591-4-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426132533.1145591-1-festevam@gmail.com> References: <20230426132533.1145591-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean From: Eduard Strehlau Add an altbootcmd script, which is convenient way to integrate with swupdate and perform a roll back of the previous working version in the case of update failure. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v3: - None configs/smegw01_defconfig | 2 +- include/configs/smegw01.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index 5d9d4194639d..418151a6de05 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -18,7 +18,7 @@ CONFIG_SYS_MEMTEST_END=0xa0000000 CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="if run loadimage; then run mmcboot; fi; " +CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; if run loadimage; then run mmcboot; fi; " CONFIG_HUSH_PARSER=y CONFIG_SYS_MAXARGS=32 CONFIG_SYS_PBSIZE=532 diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index a356f095a68c..6ee4acc70d29 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -33,6 +33,7 @@ "mmcargs=setenv bootargs console=${console},${baudrate} " \ "root=/dev/mmcblk0p${mmcpart} rootwait rw " \ __stringify(EXTRA_BOOTPARAMS) "\0" \ + "bootlimit=3\0" \ "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \ "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ @@ -40,6 +41,13 @@ "if run loadfdt; then " \ "bootz ${loadaddr} - ${fdt_addr}; " \ "fi;\0" \ + "altbootcmd=echo Performing rollback...; " \ + "if test \"${mmcpart}\" = 1; then " \ + "setenv mmcpart 2; " \ + "else " \ + "setenv mmcpart 1; " \ + "fi; setenv bootcount 0; setenv upgrade_available; setenv ustate 3; saveenv; " \ + "run bootcmd;\0" /* Physical Memory Map */ #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR