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 24EABC77B7F for ; Tue, 18 Apr 2023 13:48:54 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1648B8607B; Tue, 18 Apr 2023 15:48:13 +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="agkeFJ+o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 905B08607E; Tue, 18 Apr 2023 15:48:05 +0200 (CEST) Received: from mail-oa1-x2f.google.com (mail-oa1-x2f.google.com [IPv6:2001:4860:4864:20::2f]) (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 C7A7485D99 for ; Tue, 18 Apr 2023 15:48:01 +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-x2f.google.com with SMTP id 586e51a60fabf-188090ebf84so9056fac.1 for ; Tue, 18 Apr 2023 06:48:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681825680; x=1684417680; 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=ZEIXJ00kNa1Ia3Io8LXphkvfJr2k/iRFC92V6O/6N+E=; b=agkeFJ+oV/jhLnceI/+KczunyJiZSounO7CZcf6puyzaU4NlVa2Jfgf1VZdrl8p8VF yaN1nl7KtDGMPoqjKS69LIw4Dabjv7yzjXQaYXTit6qrbX9WiZ3fZoImFkztwuPwI1xB qutx/pgOMqi++oFQFCPFJUdoosDbhNoZ9ecgEOX/8lm7MT3RDiOAcWXjkUxy7HXpTXxO GxS+M7ZfIM+7C5stMXqT1WmpAp+YvL5gbv+PEO+TiedtjV5suDJHZCBt/CYnD1KRZF+p ZWrZe9jRKWGfIgj6iIJHRnoTbglE6p5YtBHWfqBGEAGx65FT0gDfREqFOhWYso51pWeq 2U4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681825680; x=1684417680; 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=ZEIXJ00kNa1Ia3Io8LXphkvfJr2k/iRFC92V6O/6N+E=; b=fcZ5cyfDzGFGfOenXIbCj8fNDx0Pefky57LIL9qKFUY29P7yJ7uYa7ugUO2/TOI781 m86JVO6ut0hT7peHp2JVb0aPHap8P8HYP03gIJgel1kxgkgI9EnifQKi+UWMgSwOIJ+4 pzQRtMxT66u0zlA/fPyMuaJxFOVLtUFrmce+DJ7/y0IK29tg8Rt4MHbBVvEfkbVS61U9 /+B0hD5zd//8Kq3RYRbJi20NNwrh1UUIT7cq1y35yFrrox3L+6tfvYRiZX47mZqNUo6v Hb6s0BUhb4ICyC1Mi/kAXpixKXJIdQEpwZ+TNXbmYupcmPkyG3jDKTGM/v4bwDXq547n o9+Q== X-Gm-Message-State: AAQBX9esBcd5PObs+86d9J8e6nTlw6w9eTVZ/nMv+LJLV4BUXYOhHil5 G9oEDyYZ8RBkWpII6WS3lFQFg8RCaavBnw== X-Google-Smtp-Source: AKy350Y/rOdpk4VW/GunXL1aXkcXHQp+vjfoQ/S8swsAvVP9QgjYj51t5pMLPVZIth2HN/RKZoJ/xw== X-Received: by 2002:a05:6870:d5a3:b0:187:9a3d:c8ce with SMTP id u35-20020a056870d5a300b001879a3dc8cemr8727638oao.3.1681825679965; Tue, 18 Apr 2023 06:47:59 -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.47.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 06:47:59 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: u-boot@lists.denx.de, eduard@lionizers.com, Fabio Estevam Subject: [PATCH 05/13] smegw01: Run altbootcmd in the case of failure Date: Tue, 18 Apr 2023 10:47:36 -0300 Message-Id: <20230418134744.343023-5-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 Run the altbootcmd script if any step of bootcmd fails. This ensures that always a valid image can be run. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- configs/smegw01_defconfig | 2 +- include/configs/smegw01.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index 418151a6de..b3580d5d6e 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 test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; 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; else run altbootcmd; 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 6ee4acc70d..05edaac42f 100644 --- a/include/configs/smegw01.h +++ b/include/configs/smegw01.h @@ -39,7 +39,13 @@ "mmcboot=echo Booting from mmc ...; " \ "run mmcargs; " \ "if run loadfdt; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ + "if bootz ${loadaddr} - ${fdt_addr}; then " \ + "; " \ + "else " \ + "run altbootcmd; " \ + "fi;" \ + "else " \ + "run altbootcmd; " \ "fi;\0" \ "altbootcmd=echo Performing rollback...; " \ "if test \"${mmcpart}\" = 1; then " \ -- 2.38.1