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 26460C7618E for ; Fri, 21 Apr 2023 10:58:21 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 38DD78631C; Fri, 21 Apr 2023 12:57:27 +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="l/wLvHRb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DF1C4862D5; Fri, 21 Apr 2023 12:57:17 +0200 (CEST) Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) (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 1C01886177 for ; Fri, 21 Apr 2023 12:57:15 +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-x329.google.com with SMTP id 46e09a7af769-6a603577a89so294266a34.0 for ; Fri, 21 Apr 2023 03:57:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682074633; x=1684666633; 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=4jK6TLgkwcFfxcjH4bklr1w27SrGxmQbs6+VGyJC/PI=; b=l/wLvHRbEpfdnl4k2wps5ZUTpF0pyMGxGBHN62ImFIh0NvA3lIi9HQ3Hr0Ki8GmnRG NOZ683Zh7i/EfYRREmQD7ABAWEYTTd5EILuGlvANe+oYC5NmOdEzfXiBDNIpq2f+KkdP fnCeCYSfkZsxta3jDUA6Z6w7B1BEnfLgJQ3QyDXMprlts2Wg7IdQwNukeICxoIFkXEFP 6rV/vn7xrUYFI4ooFgw6nSrnrxMT2nlyuQlbgNpIntSuiM8upuJkZtsA4PElJUr5FRp7 kPh0BfDOPmiyH2L00LYE3EdbUrW8tKFipaO7ToRtnsJllwjFzlyf8lpnV5UFLRuvKgdq lrkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682074633; x=1684666633; 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=4jK6TLgkwcFfxcjH4bklr1w27SrGxmQbs6+VGyJC/PI=; b=Bbmif4t5ogT+3mXKLp8cfc8bGl/KT5wzG7lus5Dz1L4Ka73eZvQ5ZEupQzISLz5kpb A5vzApX9Wk02uOIzocqTkr9mi4KIMpoUm7qhINf4k5He4y2zTxMGTtdMgtOPL+Vi6H4t 8HphwKE46mIJSmlfaSx5MfzWtNwTnqSYJPuj5+1VH4aLcuRT5vFMq6yawfRh6VHFdTis IiWFpCbvwKyS6rOcsqqr1PQ1zxZvSqUfQg2W/3VDn7NKoX+Y6hvcejuE/fItFQZ3wvgn Y8geGw3Fz8Ox4PT3PCv913xG9V0yV4x6bmEIE/bXSjzj1nS0oIUsFpXGiPWLqFVwHMO7 0h5w== X-Gm-Message-State: AAQBX9eIf4p0ibtfRFP+jMAGhZBROWmFBnlVzLE3ythbZHocbwR/3NyX ZhYKmwqwc2g/JMma2a3pgro= X-Google-Smtp-Source: AKy350abmHpkku50nOStzN5aWvlYLR4ypUEl4xt6iVMiN/EVktKeOOlYeVCm9D7QJCOb6yiJ9/9kiQ== X-Received: by 2002:aca:a951:0:b0:38b:eda7:816a with SMTP id s78-20020acaa951000000b0038beda7816amr2573760oie.0.1682074633520; Fri, 21 Apr 2023 03:57:13 -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.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 03:57:12 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v2 06/13] smegw01: Only commit to new partition if update was successful Date: Fri, 21 Apr 2023 07:56:49 -0300 Message-Id: <20230421105656.1062558-6-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 When performing rootfs update via swupdate, it is convenient to check the 'ustate' variable to decide whether the update succeeded or not. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v1: - None include/configs/smegw01.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/include/configs/smegw01.h b/include/configs/smegw01.h index 05edaac42f..277c828d0e 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -30,13 +30,19 @@ "bootm_size=0x10000000\0" \ "mmcdev=0\0" \ "mmcpart=1\0" \ + "mmcpart_committed=1\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/mmcblk0p${mmcpart} rootwait rw " \ + "root=/dev/mmcblk0p${mmcpart_committed} rootwait rw " \ __stringify(EXTRA_BOOTPARAMS) "\0" \ + "commit_mmc=if test \"${ustate}\" = 1 -a \"${mmcpart}\" != \"${mmcpart_committed}\"; then " \ + "setenv mmcpart_committed ${mmcpart};" \ + "saveenv;" \ + "fi;\0" \ "bootlimit=3\0" \ - "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} boot/${image}\0" \ - "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} boot/${fdtfile}\0" \ + "loadimage=load mmc ${mmcdev}:${mmcpart_committed} ${loadaddr} boot/${image}\0" \ + "loadfdt=load mmc ${mmcdev}:${mmcpart_committed} ${fdt_addr} boot/${fdtfile}\0" \ "mmcboot=echo Booting from mmc ...; " \ + "run commit_mmc; " \ "run mmcargs; " \ "if run loadfdt; then " \ "if bootz ${loadaddr} - ${fdt_addr}; then " \ @@ -48,10 +54,12 @@ "run altbootcmd; " \ "fi;\0" \ "altbootcmd=echo Performing rollback...; " \ - "if test \"${mmcpart}\" = 1; then " \ + "if test \"${mmcpart_committed}\" = 1; then " \ "setenv mmcpart 2; " \ + "setenv mmcpart_committed 2;" \ "else " \ "setenv mmcpart 1; " \ + "setenv mmcpart_committed 1;" \ "fi; setenv bootcount 0; setenv upgrade_available; setenv ustate 3; saveenv; " \ "run bootcmd;\0" -- 2.38.1