From patchwork Mon Apr 24 11:11:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772861 X-Patchwork-Delegate: trini@ti.com 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=GhZ+89CP; 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 4Q4jDW55XCz23s0 for ; Mon, 24 Apr 2023 21:13:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5CAC186114; Mon, 24 Apr 2023 13:12:43 +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="GhZ+89CP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 07B2C860C0; Mon, 24 Apr 2023 13:12:31 +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=unavailable autolearn_force=no version=3.4.2 Received: from mail-oa1-x34.google.com (mail-oa1-x34.google.com [IPv6:2001:4860:4864:20::34]) (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 05796860A5 for ; Mon, 24 Apr 2023 13:12:28 +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-oa1-x34.google.com with SMTP id 586e51a60fabf-187e0ec513eso474146fac.1 for ; Mon, 24 Apr 2023 04:12:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334746; x=1684926746; 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=MF/GVEvlybo7v/q5XDupyBFVaSxueSUqL42JZR3WrmY=; b=GhZ+89CPQa8YdQ+giGeUPSA+3m9HDbqmZdTNJiNre0PHsMfpXtiCQqIOiIVxaYjC4C 1JN4N/tOVAWjlMwQBnW3a91m8Ym+j1Jh5Dv0Ec8SHI8TzdDU2lU8tJPhZwfeZe+d4WTY cS44NFfJoiVTlg1gXi2dvV6pQi3iKlKxtxl2gP4Y2byhlQ9wMxZ7N2LvDfRDAEj0T9LD 4dBPbjZlJePtCODtNIH1fjHwT572f4F2LpWTo47zCGhCu2ZpCbHlOdrZs6/ilNI67yjH i19zuQvAz19zgEVAUEtDRvapARmlOuPMdAvbDo9KKJ+YJjDLKW7/5sRBQhSNUI2S9lqG jClQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334746; x=1684926746; 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=MF/GVEvlybo7v/q5XDupyBFVaSxueSUqL42JZR3WrmY=; b=H4WgrIpIb0kwPYtbqTyriKmQjyCyn1qqnDrZnbTFiYTOnBKFfi4uymHitByOR2ZnkZ aU9Q3llBc4Xf40NsYsUzcavgUhJXgFj3VlfFQyxHy11WnhzwGDncsYT6uDXX/g1kjJmd qLmM8P2dNH35PjAItBhIvhMGhsyVFlMQCOCu/VG1oq8yQViIDzvhBbX6Zx+p2OYraMIm ehWBXSSfXBrocpRrgf+IreoniqTUcO+5iMVk+l3X/3kYjcxg0fMtXt6P0x/22iI8oR3S hjoT/9JKxYmfZ1AYp9B2C/fAbwrbm3iw3EICc72vqTZCzFIL92sD7QbB2zMQ5pm0N7aU QfXw== X-Gm-Message-State: AAQBX9cWjw9HvWHcXcnM7a571Pz8BeE4N2gxJOQ2ONCMz3WVvEj4+b2Z 5wa3L4/uNjuoqmSM1OxorJw= X-Google-Smtp-Source: AKy350Zv+Nzr7m5Hv+A3Le9inmawJMUOrpccxAdaBJ00FtFklakK56+drXBZw4CDKVin7SdIevwTLQ== X-Received: by 2002:a05:6870:a182:b0:18e:2bb2:3f95 with SMTP id a2-20020a056870a18200b0018e2bb23f95mr5905610oaf.4.1682334746479; Mon, 24 Apr 2023 04:12:26 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:1d84:e533:11fa:26c6]) by smtp.gmail.com with ESMTPSA id 27-20020a4ae1bb000000b00541fbbbcd31sm2294678ooy.5.2023.04.24.04.12.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:25 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 06/13] smegw01: Only commit to new partition if update was successful Date: Mon, 24 Apr 2023 08:11:59 -0300 Message-Id: <20230424111206.1438983-6-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230424111206.1438983-1-festevam@gmail.com> References: <20230424111206.1438983-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 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 v2: - 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"