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 18545C77B76 for ; Tue, 18 Apr 2023 13:49:21 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 50B54860A6; Tue, 18 Apr 2023 15:48:16 +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="QJR+/khc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EE766860A8; Tue, 18 Apr 2023 15:48:09 +0200 (CEST) Received: from mail-oo1-xc33.google.com (mail-oo1-xc33.google.com [IPv6:2607:f8b0:4864:20::c33]) (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 B8D9586076 for ; Tue, 18 Apr 2023 15:48:03 +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-oo1-xc33.google.com with SMTP id 006d021491bc7-546d89bb54aso211091eaf.1 for ; Tue, 18 Apr 2023 06:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681825682; x=1684417682; 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=wv0/GYbRaM7kNG+jCjGr2SSMo26TZ6n9WmrCwXPsmDI=; b=QJR+/khcKafHnIWxMX2pbeY+/wwHGHf1VRfPSGf/l1iioDMCGOilnT7zLwZ31E/INw Ph9sIrmRwedUN4rWAEvJuzxyWq/4QqKeqIN0r29TB+LR228HMQQeYfcUXlPz3rvd8uR+ bxqgcf9ZbHoNztq4ZPaVv7aIf1zxRvFsMojmY8gE/8DkUOPEK3sEgzkeS3KsB+d1tCwI 3UVMEu4lHyQsKyWslk3+tCYkqi/mVMHMtE5ayhpYWafBipC8pmbhrptBPAAp8AFDoc+p T8ToYqQcGF4gnoNo3V6418GDydTctE/L6rUjUry7BH7XXtZPpMteCKocU7g+VczF6aWo 4DlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681825682; x=1684417682; 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=wv0/GYbRaM7kNG+jCjGr2SSMo26TZ6n9WmrCwXPsmDI=; b=WH8YI2Fk1au5keec/sIJUw3or6PGcRkvgjZYBwtlVV9JSl/6UBIYKGq4sjRmerQjEF z+9JMDnbTN77KuQntjgNy9rCQGm64wLfLUT8jCwhzhS32oE98rXf6FrEcXzNmuTjc5k2 S4sG/yjwDPinzW8O06CA/VRAxkZmdslbpn0J1Zy5/XEJt8NHu0mnf/6s0p3CU2qYYj+z /k4NajFc72ggBm7cZR1CS1MI4fmt1hTSUbeoAduQvAj7kl6qI/I5JYeyiYxRWweoPO0W 5fHHmc9BxN13sxv8mfIgrexwly4IwsfoYY5xzlVuskUb9buf64yB1nusWnKdbTwlkEv1 CG/w== X-Gm-Message-State: AAQBX9fZwsDazfxdQ3qaAT+M3/gjRdhPS8eMuip7C4V8yX7XJ1r6Ww7D sOJod8XMgWHWmwv5PWbOYlM= X-Google-Smtp-Source: AKy350Zju063OwikawpLdHOJhQN0BVjW3pQG0AoW5Z4xMc3/eANH5jMG1fXd1cLurzaSGnVGad8zuA== X-Received: by 2002:a4a:b1c7:0:b0:542:64a:88b0 with SMTP id j7-20020a4ab1c7000000b00542064a88b0mr5427339ooo.1.1681825681963; Tue, 18 Apr 2023 06:48:01 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:df3a:5c40:f24a:e8cc]) by smtp.gmail.com with ESMTPSA id 1-20020a4a1a01000000b0054157801d51sm5823246oof.38.2023.04.18.06.48.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 06:48:01 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: u-boot@lists.denx.de, eduard@lionizers.com, Fabio Estevam Subject: [PATCH 06/13] smegw01: Only commit to new partition if update was successful Date: Tue, 18 Apr 2023 10:47:37 -0300 Message-Id: <20230418134744.343023-6-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230418134744.343023-1-festevam@gmail.com> References: <20230418134744.343023-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 --- 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