From patchwork Mon Apr 24 11:12:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1772868 X-Patchwork-Delegate: trini@ti.com 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=HfcbQKW/; 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 4Q4jGF196Bz23s0 for ; Mon, 24 Apr 2023 21:15:01 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7B5D386163; Mon, 24 Apr 2023 13:13:05 +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="HfcbQKW/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B01A68610B; Mon, 24 Apr 2023 13:12:47 +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-x33.google.com (mail-oa1-x33.google.com [IPv6:2001:4860:4864:20::33]) (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 4E4568611E for ; Mon, 24 Apr 2023 13:12:43 +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-x33.google.com with SMTP id 586e51a60fabf-18806dcf1c1so633075fac.1 for ; Mon, 24 Apr 2023 04:12:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682334762; x=1684926762; 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=FnR5qFj5s8s3aIFm6sU2P0cUCGGY5oA4l4p4zGkZa/M=; b=HfcbQKW/bsKQL8t8pHeFwqpAOz1rSV8MaSIFUR/1vQbNl2oDvismFl++/wkr3zXQig 0ZSPXhjYjAGqQQI53t90fBMbrJB27fZc12QbUcKqBNZrkvjK7IrZ4iw3vYIb6qr4pPQZ lK+NMROnORvlCwviHhgK4wubl/rerwvnfqi2WBBdBL6zjnHt4oo0A+zaHm1RB51UyLPI wvDBKxyJWGMk9m1eAHf5sNs8XLCsmLSNrZbbP29VPSkpySib4BpyKScBhCvmyUgvUXrA tYlnvsV0LWc+mqcHMmjkrrdpgHixteAHf2hl0i4MQpq9UNTyeeHMZh05F9UYFFnrp+Po j/YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682334762; x=1684926762; 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=FnR5qFj5s8s3aIFm6sU2P0cUCGGY5oA4l4p4zGkZa/M=; b=AZwKC85/dRSXh7NEtYrPr5xnUrUP+cVqHtBdtOp9/eQ379ysaOKnxWwBVGNegV4jot 1eaj76DVR4C7UipwPp+ZR62OSKL4wG8qBA2/d6SdYKvk4jH+iDKdCtjK91DryHUfx1tS 9456RM0g169vT5KzKTyGnIdlszEHQFLeHxJmZkSjzgd6Rr88lYo27VmcOFLnZg8F7S6a UqDsMbW6zL62qwly7wvJQQ8YBuHpJNoaPG8b2m1o+N1vv+93XjxyM+PXOsibIrnaz/yF eAjhieHjCSy5bKwg9wicHL1oBsCMOQmdwVPRxDBE/SGZse2ZM5FF3kX+9mrejaveznkO E7pA== X-Gm-Message-State: AC+VfDziDwUt6svBavgaOIu38qdid0/2Cos+dTPvYC7SgmAz03B0CC4s waP0aXL78p6Xy+vMW6W7IMk= X-Google-Smtp-Source: ACHHUZ7RcI3/PhoiCUhzCRBFROujag2ipDj/lFt+qd0ozFQgIT9SX2aE8h8s7FPtGWYMPFZd7GhyOA== X-Received: by 2002:a05:6870:1612:b0:18e:b2f9:7bf1 with SMTP id b18-20020a056870161200b0018eb2f97bf1mr1051928oae.2.1682334761863; Mon, 24 Apr 2023 04:12:41 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 04:12:41 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v3 13/13] smegw01: Fix fallback to altbootcmd Date: Mon, 24 Apr 2023 08:12:06 -0300 Message-Id: <20230424111206.1438983-13-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 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 v2: - None configs/smegw01_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/smegw01_defconfig b/configs/smegw01_defconfig index fe8152f33e..3d2713f528 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