From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC017C77B75 for ; Fri, 21 Apr 2023 10:57:54 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 12717862E6; Fri, 21 Apr 2023 12:57:19 +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="sz6Tc36H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9FDF2862A3; Fri, 21 Apr 2023 12:57:13 +0200 (CEST) Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) (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 E313386295 for ; Fri, 21 Apr 2023 12:57:10 +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-x334.google.com with SMTP id 46e09a7af769-6a5f57c64ceso321580a34.1 for ; Fri, 21 Apr 2023 03:57:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682074629; x=1684666629; 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=cwOqNdKfE5zG3ZxtT+C27i0BSkQq898KSmzQ4dEqIaU=; b=sz6Tc36H8LFaLe5HKdrnyjMRxOl5cLE0PeO7SmSUxCciBpSZzhRZD6hlAGLEXDt+qi 0ahV0IGPr6lptC+viZPFzme7kQUDixNCqnvbjIxq1U87PesVblKIQjxkRBag0zlfRJMF FMFGcUmFnWFfDl3zrTNSmWGaRrLr80GlwAFHFOqm+J6rzLPiIzgd3UQRpUNg3Z6/Vn/T eB9YCb4UhwumdhSWywheYU/js3OJKoDrXljqEwzPkDI6e3BTM1DWIk2HC7teXu+NAi2s OmKZzGdWnYnbOW4PcZFVAhJJG+s33iMVujZgOP3NwrlUXnLWY6pogQetfCygfD7t/SVs c7yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682074629; x=1684666629; 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=cwOqNdKfE5zG3ZxtT+C27i0BSkQq898KSmzQ4dEqIaU=; b=e/P8zkO0GWgqMZ0ScoGW4bc9SWqzPAH4dWInvdku+aLml76mCuN56j1reGE8szQrBO euaAIGohORxf96zKfoxhd4s45thkNHIj0v9bxPubsyKn1OVSc1nbYHgRKsR8w/V/8qq1 DImjpjGFjQMeBqMS2WXkUx8DCF/GZcP8aakrMjMqQyhG8o9nyKNrDm/o4O13x0REC12D jNu7clDnqsQh0QR0UyMsADjmW2AocMPCmMYbfo89pb57R9u+zFkil+bi6P3c9aj38jID ai3vKkAbHo2k2AfJ2q56FZWDgvcvsOrnE2g35sBftvALEIL5D+kt4TNXuPaE98amAMwb +6cA== X-Gm-Message-State: AAQBX9dkGZifJ0YP2/POEX+CW5M+4NZL3jX4v5WQr4178IWmoHkPUDSt 3Cz99wP/rExbhwwlmggGx/FdvESxqQskXg== X-Google-Smtp-Source: AKy350ayHcSckSezWllD0RMqRgjK70wRPCfycUspTp1xIVwwhOFJ9TpvSQXIogndD20AbwB1aS6+Gw== X-Received: by 2002:aca:f055:0:b0:383:f9f5:bd60 with SMTP id o82-20020acaf055000000b00383f9f5bd60mr3022452oih.4.1682074629396; Fri, 21 Apr 2023 03:57:09 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:ada1:37ca:9336:4705]) by smtp.gmail.com with ESMTPSA id ay13-20020a056808300d00b0038e086c764dsm1508354oib.43.2023.04.21.03.57.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 03:57:09 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v2 04/13] smegw01: Add altbootcmd Date: Fri, 21 Apr 2023 07:56:47 -0300 Message-Id: <20230421105656.1062558-4-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230421105656.1062558-1-festevam@gmail.com> References: <20230421105656.1062558-1-festevam@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 v1: - 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 5d9d419463..418151a6de 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 a356f095a6..6ee4acc70d 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 -- 2.38.1