From patchwork Sat Aug 31 16:48:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Connolly X-Patchwork-Id: 824409 Delivered-To: patch@linaro.org Received: by 2002:a5d:48c1:0:b0:367:895a:4699 with SMTP id p1csp1278312wrs; Sat, 31 Aug 2024 09:49:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX8Gy985K/IGgSHZNECqKlkTi0HfBRpA9eYoLMKbm2hkijK2SQL9Xwj0m+8f5Arx31LDj9/ug==@linaro.org X-Google-Smtp-Source: AGHT+IHA5D+dA53q4ip507VuSu9XvFUpB18mUMkBCR17RGCVidZ39FGnAz6xwD9bLn9I3OTQ5R1N X-Received: by 2002:a05:600c:1d1d:b0:426:5269:1a50 with SMTP id 5b1f17b1804b1-42bbb205a6bmr40280285e9.11.1725122966713; Sat, 31 Aug 2024 09:49:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725122966; cv=none; d=google.com; s=arc-20240605; b=VDE/h9g2EFbAk5b5yn3AlejvEJC7GKeveUvqLQ3SUQ1Tx/BNzNSPpAsJG+ZeWpCqED YxZ/PFAo2xdlNC1Q5sPFjZvL5k0gq+9DqwkxR2i9Va6e3iHeNTwFx8dMAXSNOgCgOcn7 X46mA2qaTdYXRt7DaHigGBKC3H6iUzbaFFzCrZoA0AgAWhC5BxXtcDtXLMv7g+OAb8y+ BUbjP9vt0KBmICRYPMn7n5yAIFCeAQi236eWH9hXA2phKsk54jN1lj8gax16G6YxXT/k C3wd+Dbp+aFndtEOMyFTwe/fSehm+kUWWFxhnP5PDOGWCIZO/hYAWabORebHaBprETUi 5+zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:to:in-reply-to:references :message-id:content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=wbclZtwb1rxDRYxAqkLn9bT4IZ8BeBKgjxYwlFmqLO0=; fh=IZR1J8za+TbtnoPC1L4bBTQaqhI/qVu9DRMn3xTDANU=; b=kP18QhqXFadvUM9s47dR0cBfNFwUGgsDN3sBq1eu4CWXiaUV4KxwDfqUj6BWW2n5M/ cCpBL/RKzD3nkfD6f6gmoVVbh4mB/WMwtH+VsKNIZJ9xxDVzX46aNqQDqq6ys+Ay1D2X CyBcX9HdkOGmo4dwOw9xYEYOAOK0ruk6M/RRhYzRJCUwO1c6s+vfr4cc+jJrnXP6fas8 SuY6OFMqpn0yQXzi0rGbzjbmLhnZNcyE5WHJZ+gQovjV4x6BkUPfc6pi6JJ1JDOYqkW/ 9iGvJ6IwfgNk8vwcLjwY7TNhdyqZ7nWBUlxnv6vyPUy3IVWntULDeSmbv52r5hiu1cZ2 w3LQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rVea2JnW; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id 5b1f17b1804b1-42bb4ec4ffesi32645605e9.198.2024.08.31.09.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Aug 2024 09:49:26 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rVea2JnW; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F33D88D8A; Sat, 31 Aug 2024 18:49:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="rVea2JnW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6301288D83; Sat, 31 Aug 2024 18:49:00 +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,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) (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 70ED888D82 for ; Sat, 31 Aug 2024 18:48:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=caleb.connolly@linaro.org Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-42bb81e795bso22028145e9.1 for ; Sat, 31 Aug 2024 09:48:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1725122938; x=1725727738; darn=lists.denx.de; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=wbclZtwb1rxDRYxAqkLn9bT4IZ8BeBKgjxYwlFmqLO0=; b=rVea2JnWQwQhR/fDtIPqs6fSu81EOPf6xDf69WXvSvvdeFzap2loJrpbfnkxUwdiKB 30TPQOP8aoWC/DUnh29GjfaImUmP9rtICpumQSk2LayfnNmCH3+ABb3dFdnC5sbtpIIC jWNEPylz9yHFkWx9Z3LzFzPSAfbkM48dWXMRhyrV0evYt0ZjkgxTFqabehFhlawZatlT zQT9Z7DUMGgJR8MHbq+pJmzEULVSKk+fMeJ1gn6OtQPSfhfVQ97CrZLijBZzZIc/VARE YcY7HJjNQTWZwZa1l29BHMUAK2YhDUyLkJ+WoFH5SyK7mSb0hjIChFu5SWvHuFihqT2N j4bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725122938; x=1725727738; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wbclZtwb1rxDRYxAqkLn9bT4IZ8BeBKgjxYwlFmqLO0=; b=emnPANYx2AKDpftEpwdwQ3yxnaXc1l7mJjlMxSRT5GsFi9xXikhWm+XlaJbO6OjPP9 T2gwk54tZPvnUbZobIMlFyriz4I763pGYEckcgQ3Ucpb9+Js25JVT6f60JLUmNqfpm4b YLoCY/FGmaoApZJoyemUPsUo5Zp027F2TKgJZ2x8ONcdrEf0rH4ulNICq0Xe8pvtH0+V kcMvSJPcUJ9kh/uHoHbpY8uhf37NWzLIgDiKYx6UlFClOH4Ire4IVLC7h4jx6UHDRPmi ZXrQF4GQrUuuDIWrDV19Ykb13J8Tn4O0BOywSBaVgKOgGliJloyaaU4IoDr/KKz8j3m8 cXGQ== X-Forwarded-Encrypted: i=1; AJvYcCUUmn4aSU2dEGUSfuxNFfN2PiSBrBR/OXhvdkdbajaIuhjei4OzzZ70bH/vpkxRI1QA1xSkPtA=@lists.denx.de X-Gm-Message-State: AOJu0Yw/mM+FJ0EiDhWp6+aWuEokjRih60V2BLCs+BfBDoFUcF09futn Bq7SyhekCjyzMX+pxQH173rTE2p4O9zLW1iYtjGb7fUuPuTIGNfGEhp1umyo+tQFDvkGx8gZ11o oIwI= X-Received: by 2002:a05:600c:4683:b0:427:ac40:d4b1 with SMTP id 5b1f17b1804b1-42bbb436e2emr44396615e9.27.1725122937721; Sat, 31 Aug 2024 09:48:57 -0700 (PDT) Received: from [172.18.168.79] (ip-185-104-138-67.ptr.icomera.net. [185.104.138.67]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42ba6425a77sm116699105e9.45.2024.08.31.09.48.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Aug 2024 09:48:57 -0700 (PDT) From: Caleb Connolly Date: Sat, 31 Aug 2024 17:48:53 +0100 Subject: [PATCH 3/4] bootretry: check for bootretry variable changes MIME-Version: 1.0 Message-Id: <20240831-qcom-phones-v1-3-08614edd8e35@linaro.org> References: <20240831-qcom-phones-v1-0-08614edd8e35@linaro.org> In-Reply-To: <20240831-qcom-phones-v1-0-08614edd8e35@linaro.org> To: Caleb Connolly , Neil Armstrong , Sumit Garg , Tom Rini Cc: u-boot-qcom@groups.io, u-boot@lists.denx.de X-Mailer: b4 0.14-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=1156; i=caleb.connolly@linaro.org; h=from:subject:message-id; bh=0H8n+0j/GEL2grXCaQaQ4ZqsFCay3wzebXIywJAd20c=; b=owEBbQKS/ZANAwAIAQWDMSsZX2S2AcsmYgBm00l0u+qiQdQVcUA9sKP+sf+p1MM+eDBQVERcJ tUcRjv2rZ+JAjMEAAEIAB0WIQS2UaFGPGq+0GkMVc0FgzErGV9ktgUCZtNJdAAKCRAFgzErGV9k tmfvD/9ce2jCClWsvWJ4/7aNWEeHojbVWwhY27mbMaBFceL3XmB6lkCgMn7akwQhuZ0QEP1WeFq 8GXn2xYcwKPhSRcs6h5yLlLWS8NkKsUduIQv6g4EQKEfYbf3KfQP77vjCQT6p17q0wxerJvOBlC 0e+e4YLP9cJRMQwL/hr7hOYpEuxIxM18llx3tXwaK6427WWlBfvsDoo6EISWKPTh5vr4zBf3Q4O t4meIKY2sjDG0O9dKFzYPVneSqcF8n8u7m68q0HWX9ysd+lVBn2cIr67fPSoxLtUvS3BnIvPT75 pIEHwQBkI9V97OD66wqNQUyLi8sZgXUt042ob2JFsQ2famX1lkhwKpCw9Xz1yqLkwSisGKsfJj+ H5cCZvhTrxr1HLWUdlOpOldMLZbiAs51U08ZDWJ05tXBMHcw6PCcFaqm0ZMUV3aLeC+li0svriR /p1F8M8yQQxQEKpPkNahcYH5CODWKkHhjjNH9+zGSOztFXoQU8OApX/SVubignNuU7rXOd7O/m7 LDesp8vCPPdyeIch2te+igliF1jtJWBytTwzG7yhZmwD2yZ6KIX7lg4b2YA43NRxWWHaeLawBFS eQ5Owynr3u+5p+bAo2h3S2rJEksjbCQwvrUcpdpve+5mHS0hp+ld9GS4CVW8KbKto+gV66Lt/yD +1AFgpVDfJqoLOQ== X-Developer-Key: i=caleb.connolly@linaro.org; a=openpgp; fpr=83B24DA7FE145076BC38BB250CD904EB673A7C47 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 To enable more complex sequencing of the bootmenu, autoboot, and bootretry, handle changes to the bootretry variable between tries. This makes it possible to turn bootretry off (e.g. to drop to a shell) and then back on again. This makes it possible to have a persistent bootmenu (the only way to navigate U-Boot on devices like smartphones which lack a physical keyboard) by having bootcmd be defined to launch the bootmenu. This allows for menu options like enabling USB mass storage gadget to return back to the boot menu once the gadget is shut down. Signed-off-by: Caleb Connolly --- boot/bootretry.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/bootretry.c b/boot/bootretry.c index 587b2de7d6b0..a60767eaa2ee 100644 --- a/boot/bootretry.c +++ b/boot/bootretry.c @@ -36,8 +36,10 @@ void bootretry_init_cmd_timeout(void) * reset command line timeout to retry_time seconds */ void bootretry_reset_cmd_timeout(void) { + /* Parse changes to bootretry */ + bootretry_init_cmd_timeout(); endtime = endtick(retry_time); } int bootretry_tstc_timeout(void)