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 CA3BAC7618E for ; Mon, 24 Apr 2023 11:13:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0519B86040; Mon, 24 Apr 2023 13:12:39 +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="SfQTNeNj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 30D7386065; Mon, 24 Apr 2023 13:12:29 +0200 (CEST) Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) (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 D2C7D86043 for ; Mon, 24 Apr 2023 13:12:25 +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-ot1-x32e.google.com with SMTP id 46e09a7af769-6a5f57c64ceso677905a34.1 for ; Mon, 24 Apr 2023 04:12:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334744; x=1684926744; 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=cxel8H4F39ST1CDEeq8qapt3LyGS0joyZ9YAhlzBxVU=; b=SfQTNeNjG5ZxgPtHsnrhba6avcPZpmJc2JH97Sr2A6+ibp6qYap3tTSK5IfNhXutj9 eG6UMrky4Y3G2haQ4HIhN98tdkG/ESfClg1XMALrH2qwBL5l6O6J6xWdtjvlqirljWt3 QNxpUhITDKnboOCV6yLOIMsZDf86Vb2h9v5XpLgYoDQocEH5pNFQv1WoeRaqdfj/c+qT JhDdZGfTSLilquds5E5JzcwU5c0vBfIW0xSokVy8lBitbwaHa8AkPawjrpWFLX+EIVAt /nL+9aMiZIW10oKYJ6E6hBn2yPAhqUrsqIvBGWP8EBr0jZAJTVn1j3GnE7iCCzbmpqMs R4+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334744; x=1684926744; 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=cxel8H4F39ST1CDEeq8qapt3LyGS0joyZ9YAhlzBxVU=; b=KY3bzJ+i9CvJoxy0YfC4DHzHbLHF5xbrI7YwZQkqmKTifjHZO7yU1WTb4dlQk+8UlI pVTzjx45YZhj8cvtltFLFsYyO7c8Y/9RSzvI9xVbulDubjbHigWcp07rChxy+W7tphN8 EwA6d+NclWIFJuPiaKoIHrERy1Y/XTypVsFB5UeUmotbklVHGD1UC3XGePswNhnPLtJ+ vMSA7IJ1raYf5YRf5ULDOFIsGPQUQOaxYdCeTaX6s/lVN10n59yfX18FxgpIf9KKroxd 97e0hoD7n58zQqPUEqEj/plx8EbdaT40e2gnjiNLXdjtwefdthz2UdttUIcg6Qrm8MY6 7qkg== X-Gm-Message-State: AAQBX9ds2+Xh8O1pAiKnfpU7RZG8m+d4uM21oUnH1LjZ/phDL532cxW6 XRGJvtQW9d8uRddpJpTreH4= X-Google-Smtp-Source: AKy350Y02dzSW4BhEZF58032MIjMlb6ciUT/ordCeqd37Dhr6JcHai7D68+/yN5Rxde3pZkurkcdzg== X-Received: by 2002:a05:6870:fb90:b0:18e:8d82:5c19 with SMTP id kv16-20020a056870fb9000b0018e8d825c19mr2987996oab.1.1682334744278; Mon, 24 Apr 2023 04:12:24 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:23 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 05/13] smegw01: Run altbootcmd in the case of failure Date: Mon, 24 Apr 2023 08:11:58 -0300 Message-Id: <20230424111206.1438983-5-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 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 --- Changes since v2: - 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 " \ -- 2.38.1