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 BCD38C77B75 for ; Tue, 18 Apr 2023 13:50:41 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1ADBC860A4; Tue, 18 Apr 2023 15:48:30 +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="g9wYFdAa"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 41A8D860BA; Tue, 18 Apr 2023 15:48:20 +0200 (CEST) Received: from mail-oo1-xc2a.google.com (mail-oo1-xc2a.google.com [IPv6:2607:f8b0:4864:20::c2a]) (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 784EF860B1 for ; Tue, 18 Apr 2023 15:48:17 +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-oo1-xc2a.google.com with SMTP id 006d021491bc7-541b6421209so367448eaf.0 for ; Tue, 18 Apr 2023 06:48:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681825696; x=1684417696; 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=kPU0wYeIKMdI+HLGpZTs4asMo/StZWLJUXEwDKoAQpY=; b=g9wYFdAa0kElphq3AriPPCGJkdXD0OqsU509ZV5Au0HW5y0oUzoBpEe5Cg/SDqgoOz HmdHIpBvVUBVAmpmm3mgqTRpqrGv2spvCMyFzQNYruSwW7dlMMqhXsYODLhnQKxBHUNz tEq/XViIvEo+FQ7lo9Mp2adL6CJGUKJNbgqlO/0tZevW/78vMnDBphq0Trg+uoJL772E MlX4D9OWYN6ZHNXxJS84YaDAKylkaYePINXIBerK4u0KJACL5Jwow9nfJxB7H658F1oG I5Fvp77LaDBy5qO8Gd95yp41gXvyrNp+aJ/oIpSuj/zuIJY3VZy4U3wDePxx9o5zPz8L cAXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681825696; x=1684417696; 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=kPU0wYeIKMdI+HLGpZTs4asMo/StZWLJUXEwDKoAQpY=; b=I3JxLtsAwnPQqJTPvIL0EP8GZQwBfXCDEMqpAiaJHJuVU3VIgLW6m7hFg6qhycJvMH w2Jvw3SACwcaezpJD3m0VDJQdGBkHr2xVfQSTyr4j1ft9T8sWPCdZns19OjYAEjFyXSD BBtk/NNNrLpiOgs2FzH5wVikbfrS6i7TVCeOGCWIVnnDIhucaqYC3ucpZdR3Hpw38nkK Q+Msl6XO/P6lwj6cxQxtMH1L+1TE7Rs0HmnG9m0N9IbQ2hvW3rFRMamAkBv8WTSnRJNV yP2UAsymQZcL0pA3pCpC+D6aAT1t+Mx5XvQJ466+tZ/M6EVSRU8MqWIyUkx33hiuA1qh x3EQ== X-Gm-Message-State: AAQBX9d/DB0aZLXoaDLmWCIgBvYHrueqZ0lpNGrCnOpdsyYhRQJnJCug +R7KnZzrMzrVajfMTizGawa3GTS3X/zwvQ== X-Google-Smtp-Source: AKy350ZcPJc00O2STKLz6dzOkLwqIhEPq1ydjUEzyLT+o3oee8eq4AnEWxVTYfNi79QPXZMR/v1fLg== X-Received: by 2002:a4a:b1c7:0:b0:542:64a:88b0 with SMTP id j7-20020a4ab1c7000000b00542064a88b0mr5427745ooo.1.1681825695982; Tue, 18 Apr 2023 06:48:15 -0700 (PDT) Received: from fabio-Precision-3551.. ([2804:14c:485:4b69:df3a:5c40:f24a:e8cc]) by smtp.gmail.com with ESMTPSA id 1-20020a4a1a01000000b0054157801d51sm5823246oof.38.2023.04.18.06.48.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 06:48:15 -0700 (PDT) From: Fabio Estevam To: sbabic@denx.de Cc: u-boot@lists.denx.de, eduard@lionizers.com, Fabio Estevam Subject: [PATCH 13/13] smegw01: Fix fallback to altbootcmd Date: Tue, 18 Apr 2023 10:47:44 -0300 Message-Id: <20230418134744.343023-13-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230418134744.343023-1-festevam@gmail.com> References: <20230418134744.343023-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 --- 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 -- 2.38.1