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 F0546C7618E for ; Wed, 26 Apr 2023 13:28:49 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7CA5685B59; Wed, 26 Apr 2023 15:26:35 +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="O0tHAjla"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 653B1863A1; Wed, 26 Apr 2023 15:26:18 +0200 (CEST) Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) (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 7BAE786398 for ; Wed, 26 Apr 2023 15:26:15 +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-x329.google.com with SMTP id 46e09a7af769-6a4124c8328so1516165a34.1 for ; Wed, 26 Apr 2023 06:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682515575; x=1685107575; 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=YML2L8YghSCvsgjxZXuPFPwjusVjBEgRUDZAEPSX3kQ=; b=O0tHAjla9yCnmu1gSBx8r6C1oTQlRwg6GPYRSH2myS92JNKBiKTk6YgWmYcnTJTKyM iBmSMTW78Qc69dZ7cvY9VMZblly4f7o4AinCqA7FBMlA0I1wsekUE8wlXi50WEYPTRKB te7kIKVGNOsKOnITorg4N85FKM4brZLaox0Ioz+QWj+W/8HQ/bkDoDC3z/teCBcOrfBf v5qDeN22lMBPbIn/3fOteSNde8EPhc4zmskAA4wxsjSc5j/RQhGN+WtJEoUPrRATPktd 0L5SUb8z772UGVLDXEJypYBpyFDat/y8T7dcd+gJfEIIWZgw7+ua1GgiYvT4ZcjEI9CQ KuPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682515575; x=1685107575; 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=YML2L8YghSCvsgjxZXuPFPwjusVjBEgRUDZAEPSX3kQ=; b=jUDc3xXMXyeFpt3Pg2D3pJZ2DLB4Z6yvBQuqR5QLjOBvml8yGuzjmyJNOJtsundrEL 7ANke94XQ5gOgyCqya9/rILxkopvWijZMlodLzdpfimCz4/iPoaO9h8E8TwNMC2QILWK qCHZNzQztBv3cPYWOd9g1jZcYi48h+Ux4VlSrOBa6lwoGx3DCzUC9ZcSKigzSbG8AEzR KnOncWkT/8K3M3Al5GgWJi40SwP4/zl5wYywl4sRp1jhmBv/02KGEbRHR5n5hqQPxytd iqpfE0TVsfkxK3CmhVcT4/SQrWv/ujJTuQr7qpAmXxkWuwavUid5uXdanthgJXg3quno ZBng== X-Gm-Message-State: AAQBX9cwRGfkttA/CmF78zQrzGtGFNl0oy9K6+HfYF6hba9/LTyaBDor VHsuN7DKaMuF4p82iLEv4tE= X-Google-Smtp-Source: AKy350Ymsmpz5QRBjecgr5FY22FHFiFHdmeiCvdeRXpEN6p1Uk1/2Fe4mR8jlX2GnEdHYNyqVD3q+Q== X-Received: by 2002:a05:6830:370f:b0:6a5:ea67:9f62 with SMTP id bl15-20020a056830370f00b006a5ea679f62mr12660052otb.0.1682515574998; Wed, 26 Apr 2023 06:26:14 -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.26.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 06:26:14 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: eduard@lionizers.com, u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH v4 13/14] smegw01: Fix fallback to altbootcmd Date: Wed, 26 Apr 2023 10:25:32 -0300 Message-Id: <20230426132533.1145591-13-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 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 v3: - 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 -- 2.34.1