From patchwork Wed Apr 26 16:04:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1774157 X-Patchwork-Delegate: sbabic@denx.de 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=aSFLHhMv; 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 4Q63dT09W4z23vJ for ; Thu, 27 Apr 2023 02:06:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3634B8639A; Wed, 26 Apr 2023 18:05: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=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="aSFLHhMv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AC2E68636B; Wed, 26 Apr 2023 18:05:24 +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=ham autolearn_force=no version=3.4.2 Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) (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 3834B86380 for ; Wed, 26 Apr 2023 18:05:22 +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-x35.google.com with SMTP id 586e51a60fabf-188090ebf84so1146389fac.1 for ; Wed, 26 Apr 2023 09:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525121; x=1685117121; 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=rl45SiubKxz1YSniOOUXGBTFbgK4g+TCE2b2lk2rQMQ=; b=aSFLHhMvKBlvlvht0WRfZe9ei/qMaTy8+qPnaPhhpp+iNKIpXqP9naMa/fY5bG8VDQ qlVRetVpduvz7lzXN4jWO/euIlao24SYRIGMbVJUqL6yxcAAUIjMoyalu8c7t3JdycYe 1SN0N+LPGajl29Hjbr+e2FaaoGPReZQVdBpJS8Vaw5h2WuVZ+7tZ1iTHreMZnJv5GSRT dt0GO2dKJRoXZTk5bn+C0xfqDe9K12Mke9a3rCJggyCi9GMCxz5z/bwzCtbWr3L45rzJ Az6V8DtRRkTwyfj/2xGsoH3qQRAT7TWrpCLYMehW0jFVZcM3SowtaQLCzwrmHOEkoaTm c+Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525121; x=1685117121; 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=rl45SiubKxz1YSniOOUXGBTFbgK4g+TCE2b2lk2rQMQ=; b=Jke2q74KJl/+Li4tG6jmoQiUaRP2ab/CvSVUw72GA2xby/waxTdutiAdhwXbDyvuGV kY4dIQiFYfYDZznakzD/4jcDn+dupd+eOrpkmAeA/qWqe/Mvtk9DF+5+G07La8E5fEXM /nkDb+Jl3itSLZRiaKjwMD4+N2visdFosW2KVsBKBbK1LLUb5ig09QYijh7443HFHFWr zrvgVDVy3pKEMmjm/HL5Oz6cUeFYKdgVuYrtsUi4SBkumMRPcg7peIXI1Scq8fLBRah5 KO/8ZFfmQ6WUVX896DAiCO+m/aur27ax0xOzAtKwDjfFl2gFRuFgvybf2ACBT/cygcpd +nkw== X-Gm-Message-State: AAQBX9dJUYULuI+pSR5liXFGL0H/s67awOVHr2iF+CzAE4BxnRXIQTYq 3WNn9i87NCWXX91Pz/5fD/I= X-Google-Smtp-Source: AKy350bWaFIuAdF/zwTg5hUpG+Hjvkz2Dl8yOxs10ztN1Ts332s8ezx1b4BkyvCgaeiCGJw9dC6Dxg== X-Received: by 2002:a05:6870:b689:b0:17e:a596:672f with SMTP id cy9-20020a056870b68900b0017ea596672fmr12869078oab.4.1682525120673; Wed, 26 Apr 2023 09:05:20 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id u2-20020a05687036c200b00177c314a358sm6755325oak.22.2023.04.26.09.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:20 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 05/14] smegw01: Run altbootcmd in the case of failure Date: Wed, 26 Apr 2023 13:04:52 -0300 Message-Id: <20230426160501.1199085-5-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426160501.1199085-1-festevam@gmail.com> References: <20230426160501.1199085-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 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 --- Changes since v4: - None 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 418151a6de05..b3580d5d6e54 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 6ee4acc70d29..05edaac42f8e 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 " \