From patchwork Fri Apr 21 10:56:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1771827 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=a61xq/RH; 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 4Q2s292sqPz23tk for ; Fri, 21 Apr 2023 20:58:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4E9CA8630D; Fri, 21 Apr 2023 12:57:21 +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="a61xq/RH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EB8EA8617E; Fri, 21 Apr 2023 12:57:14 +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-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) (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 CD12286177 for ; Fri, 21 Apr 2023 12:57:11 +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-x29.google.com with SMTP id 586e51a60fabf-1842ca055d2so206464fac.0 for ; Fri, 21 Apr 2023 03:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682074631; x=1684666631; 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=ofno+sKxaUc9YKOrkBOABMDpvj8mJcS57D/h6KayMuk=; b=a61xq/RHZX+tYJ2dVwxcAUjrrExMw/mIrb4F0wIlIP/vESAE9JJZi05r+l355cU/CC tLTLavAJAU015BGORFJgIU360yxUp/z5Awvc5ltICoCiY1v3Q0zrCLisKphKFnnX/qEV u+3t+BpjU/1T/NLtvcYiISNEYiJ8+lWbdD52RzkcAlUJXkYMmjlsukkfHe2wx6zsug5Z y6h/qte2znEBuj0VRXq5mnUP4XH34ysA7g4wezGtrpM2r+vpKsDlutZaDkuBBVyqK3c+ OS1XSftjp9GRZp8df85ihlZrolHwuwiMv3Hg/oW8qOp6X2L+Qp5vuvjZpGdOVriPbr2g 6MBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682074631; x=1684666631; 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=ofno+sKxaUc9YKOrkBOABMDpvj8mJcS57D/h6KayMuk=; b=JeREoiGSwGGTE7Qytl0MnQdtxc+VKXxnCKXBH2f8+EnXCZZwMATf88MGylxNvUHO8r 0sSrMhCHcJXuugn8kXC9pjynUmexjyfJX/+Ro6M6a2HUMWCJ8bjRG7zfsZ4hgTjo6eLX m7sbU683bhuH+9Zx0WD5z1kD0rT3ySJRC6b2/Qw/do0PMpjLupcuXZ9ekyHHo6zw5Pph yXEfzjN+x3fHAOUX2vUoAdzWRGBBGGGTinoZz7O7PXiWN0CScnNxLZBffm8faqOMtFFu H3S9KAa/ZD5SwNybxIPwFh+s2eQVXW4hgQltf9f5Ls8Lrov9hWrDpQisVnJnVpdMFrzn AkTQ== X-Gm-Message-State: AAQBX9cfhrJ8PZDfchYruYdmzdA2jf65+QitYn3C4JfXEUiMXwYfWy+9 YeqpJodFNo/zkocfutheJKI= X-Google-Smtp-Source: AKy350bCOEvPQiNPQ0T8HTKVjzZsQZX9Kr+0kI/g8ghvgKt7cp/xPVbXt6Q1LkxCCnkwUeXQC7Ms3A== X-Received: by 2002:a05:6870:a182:b0:18e:2bb2:3f95 with SMTP id a2-20020a056870a18200b0018e2bb23f95mr502750oaf.4.1682074631314; Fri, 21 Apr 2023 03:57:11 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 03:57:11 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v2 05/13] smegw01: Run altbootcmd in the case of failure Date: Fri, 21 Apr 2023 07:56:48 -0300 Message-Id: <20230421105656.1062558-5-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 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 v1: - 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 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 " \