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 D9BFDC7618E for ; Wed, 26 Apr 2023 13:27:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 94F0E8638B; Wed, 26 Apr 2023 15:26:14 +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="YHcARtM+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2A9EA8637E; Wed, 26 Apr 2023 15:26:03 +0200 (CEST) Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) (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 19B838445D for ; Wed, 26 Apr 2023 15:25:58 +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-x32f.google.com with SMTP id 46e09a7af769-6a603577a89so1511879a34.0 for ; Wed, 26 Apr 2023 06:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682515556; x=1685107556; 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=h1JArPjTLfm4izBlcjBsLUpq/TnMyTvjpspArgRT290=; b=YHcARtM+T/jGbQoFbkhwF2zgDGnPMESrp7uA1o99ebQcFmM02D5qf/nzDeZVOFNpz4 kRhn13wl0vpaVPzhV5+eYpCS/Re/K5juKlrgmnn89uH40HrvvWaqoHXDkg93ZH6aQTzk 3wC7kyiPNsm5bI3kUhnRzJKmWS3z/fh+7Y6O6Dw9H5iRHKuM8UVZYd1PTJP6x433M3Yl H1qMlqLk7tyUQhAHmmv0vFRvvStfbTh/mH10ABwRAWajvo0cHGQtXH+IJb07J81zdaj6 W7eJerVr23d1WbmYiDR3VJR0j7S1BohYZXEEn2h3tryz0V0CLUnkBSudcdhnRHGrmLgh 3vKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682515557; x=1685107557; 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=h1JArPjTLfm4izBlcjBsLUpq/TnMyTvjpspArgRT290=; b=NWYJvbCXShlbbU95lGhLoeJj4OKpQ7lr+TXTUGu6bgZxfxp6+4jBv2EFuqBOC65ci5 36c6tQAoJV6NsvHEg0MBXscacDZeEMhxYOCjp/3EYWUL7r8M0qObLTRCSfTI21DU4Q7y aORS+W7QAnCXyoMinBR8OLZ8P/LwVluzedB25Th4ZPHpZ2ywgcnBaOhO+AxOB/FhMVxB niO9wJ3thmOFS4gAWyfhwh/lstvzB90x3ZS3kEjq+JMrZUJS4VTUn4CFD+JAwt4oFYU1 o4rFGJAgz71KP1srZ7hANfztf5fXAunRRJSMMbZvoqmmVYkfKQi0Bd7iYwRgcOdGEuzU VCKQ== X-Gm-Message-State: AAQBX9dEa8hkrFddhygLjoi8wsFW6/QHBnrS+U/OwM7VhRrIVHLb0602 kmV9v1G/K3KyThALAZaQRnM= X-Google-Smtp-Source: AKy350YTDUxZvbt1dWIYVUZA/gTNe/o9RuGx4KkjWJAnzY5YICUa5xdbMJB0a/+CrU4uoEcR+taQgg== X-Received: by 2002:a05:6830:1c68:b0:6a5:e455:fa03 with SMTP id o40-20020a0568301c6800b006a5e455fa03mr10454783otg.2.1682515556697; Wed, 26 Apr 2023 06:25:56 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:f6e1:8741:de7a:38fc]) by smtp.gmail.com with ESMTPSA id h9-20020a056830164900b006a61bef7968sm6762384otr.53.2023.04.26.06.25.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 06:25:55 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v4 05/14] smegw01: Run altbootcmd in the case of failure Date: Wed, 26 Apr 2023 10:25:24 -0300 Message-Id: <20230426132533.1145591-5-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230426132533.1145591-1-festevam@gmail.com> References: <20230426132533.1145591-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 v3: - 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 " \ -- 2.34.1