From patchwork Wed Apr 26 16:05:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1774166 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=85.214.62.61; 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=ksJjDEIn; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4Q63gt1chKz23vJ for ; Thu, 27 Apr 2023 02:08:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AA7AC86333; Wed, 26 Apr 2023 18:05:55 +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="ksJjDEIn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 84975863EF; Wed, 26 Apr 2023 18:05:44 +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=unavailable autolearn_force=no version=3.4.2 Received: from mail-oa1-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) (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 4923B863C8 for ; Wed, 26 Apr 2023 18:05:42 +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-x2b.google.com with SMTP id 586e51a60fabf-1840ad6769fso1142557fac.0 for ; Wed, 26 Apr 2023 09:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682525141; x=1685117141; 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=wJNLEmqBp/tJNiAP4E4jK/WYELgQuyQ7elQi5ypldCs=; b=ksJjDEIn0fbmMmWd8c2MQ82euPgN1qL2l/GAb2XFnGo9xLsbpKpJnZEybzwiir2dyr 7jxVqtiiZVBM0Y023q+xdbjT1ToVc45idQev03QhxCNmKdTePI15XDh9S3OJMVQQexT7 0X4VCf7kcNuntysy3vQWNvQxcl/5q4FEXMxh6YavfsP6PYhq9bsYgLxH4QE9gSMdo2i1 fXQq16HbcCQ/hxPGDP1QxznJhSeOY9qVYmgRJakjM3xVZ6sz3q4mECbMl1FY2/GrMvoJ Tepk/JnhX/u7YBF3Pn71fMrPszDeOonNKMK9NJ3uDZibV4EiN8wTYhX45nmSR9A/XsWN XN7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682525141; x=1685117141; 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=wJNLEmqBp/tJNiAP4E4jK/WYELgQuyQ7elQi5ypldCs=; b=ScNXHTKj2NutNEj8G27LWMQvN9vtHq6nrUpMNMDeRnhpfMDmgpKM39CRnW9GaGjERl O0bF9hxJg4doVFb4xRE5OKx/J8u/pUy8VauvoM6EmH7TUAIH1/7sy9QDu6oCUv5Ee/lm EUJlN6PX+MgKonvoxwVUuYQfgIYmDyjyoHag8MmnlGLhI/1rXrIqZdcE6COOSrEpX8tp 7oNTYP9rZGvjSuwnxLIznsl2qhU21Il8Gt5ftQ3BiXzmglmINikJ5g6CZ0fDgqelxNuj nyKO+vGRRmlN/AY9ps7fWf0CmpRr+cPJmH6GS/RQWLoDtS+dDvPLk2+d00n4Gg+Y8Mlg /IjQ== X-Gm-Message-State: AAQBX9dfl6XmjopfNQDudKOBKhsS7mG68QSXLWcJ79GLVljN7vOzPc7R sv1oOZyHyVeY90hPoLQHvjRjSismsl+lGw== X-Google-Smtp-Source: AKy350aaExEKJpucRpZwgdZvYPP1WGQdvxfZ6mflYBRnWJf6An0mvjzRas0j57vBKY3iUhi3M4dlTA== X-Received: by 2002:a05:6871:8a7:b0:177:8383:7287 with SMTP id r39-20020a05687108a700b0017783837287mr14239487oaq.5.1682525140908; Wed, 26 Apr 2023 09:05:40 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 09:05:40 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v5 13/14] smegw01: Fix fallback to altbootcmd Date: Wed, 26 Apr 2023 13:05:00 -0300 Message-Id: <20230426160501.1199085-13-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 The bootcmd/altbootcmd mechanism is not invoked for bootmenus. Manually compare bootcount and bootlimit to implement fallback on all codepaths. Signed-off-by: Eduard Strehlau Signed-off-by: Fabio Estevam --- Changes since v4: - None configs/smegw01_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index fe8152f33e6e..3d2713f52807 100644 --- a/configs/smegw01_defconfig +++ b/configs/smegw01_defconfig @@ -23,7 +23,7 @@ CONFIG_AUTOBOOT_MENU_SHOW=y # CONFIG_CMD_BOOTEFI_BOOTMGR is not set CONFIG_BOOTMENU_DISABLE_UBOOT_CONSOLE=y CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; run mmcboot; " +CONFIG_BOOTCOMMAND="if test \"${bootcount}\" -gt \"${bootlimit}\"; then run altbootcmd; else if test \"${ustate}\" = 1; then setenv upgrade_available 1; saveenv; fi; run mmcboot; fi;" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="run setup_boot_menu;" CONFIG_HUSH_PARSER=y