From patchwork Mon Dec 8 12:39:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 853 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765197619; bh=qrfJgEb4RUCeeg+YZxDjWK9uFKx8Bhg1SxW/uE048qk=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Xn2QbAS9LEleCvs8VXYEvnTILhJ/7ATQuuUg0Cb+YtvehvWx60XKI+dGOm4qPOggg L4z9sAp4AUf/ejmCfH6GevYnxquID7u5R/m0Q/jLPjYvP1KqhOb9BeTzJQzDtAsOLR ycRwOK67m+59MFb7m+vkFtNowggfLy0t0kGYJvFvUAQiVKUeVgU6VttpP2HAlhQj4x j2/GsQ9xJYafCu3nCmoTGsj8qH/2meePcyhzhhU2YVx+/QLo5Mp2h7CoawR0Vw7Blh DguddHO2xpPIRO8ykE8jksvYIOHurNmc16ZTeYbQmMiQWsrbxrFlQOmzrhRdAPZXdK oMYpNLJ73Omaw== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id BC35168A00 for ; Mon, 8 Dec 2025 05:40:19 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id L7R-jroGWbWi for ; Mon, 8 Dec 2025 05:40:19 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765197619; bh=qrfJgEb4RUCeeg+YZxDjWK9uFKx8Bhg1SxW/uE048qk=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=Xn2QbAS9LEleCvs8VXYEvnTILhJ/7ATQuuUg0Cb+YtvehvWx60XKI+dGOm4qPOggg L4z9sAp4AUf/ejmCfH6GevYnxquID7u5R/m0Q/jLPjYvP1KqhOb9BeTzJQzDtAsOLR ycRwOK67m+59MFb7m+vkFtNowggfLy0t0kGYJvFvUAQiVKUeVgU6VttpP2HAlhQj4x j2/GsQ9xJYafCu3nCmoTGsj8qH/2meePcyhzhhU2YVx+/QLo5Mp2h7CoawR0Vw7Blh DguddHO2xpPIRO8ykE8jksvYIOHurNmc16ZTeYbQmMiQWsrbxrFlQOmzrhRdAPZXdK oMYpNLJ73Omaw== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 988A7689FB for ; Mon, 8 Dec 2025 05:40:19 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765197616; bh=Uzm5KVNA7TRvmjgl6TVWBBfp9o3TnGIQu7eDOGW/t/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a3aN0l0QVkgK4uIOwFvcK1Cz5C3fjbfAG5jVupY+vRhKxcREJJWvT7OL0UgK8y6E+ rjIsDZIZcNLzjfb0vnWcooob9WjV21m5ButGHeihtAZ7Cpx73wTjw1csItM6Lzgihs JTKgU83OYMpR/03NGVNBkNh94daQolVQ1DjJ4fxZo7BdVb/hOh6lNf4yi0VuM2ehA0 trky2+K1lCrpWKJ/HTwRT52F7WNThH818vRp8w1LZQcgS4kMF8ELzIOVwyOqoQTWEE C0dETCJyYhjcibgzr79o9RRO4aiMTuHQovXexmwBkMHSH3NaS3TQwKS9volWUv4mkG KxmvzOXsYcKFg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 21E0868988; Mon, 8 Dec 2025 05:40:16 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id g-dujtxP3mXS; Mon, 8 Dec 2025 05:40:16 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1765197615; bh=LhuTvjuGn4ahoIZzbtvQkq77Dq5xTjIg3goaKrxG1k0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hclX7Bl+oWyBez8ogGr+mWy1KFUke17dhrnqQ6QaBG+PV9qk+tAPaL9Qfdy2GjB6I dzsCnt0jrPwcKCPLuTgDs7fKa28FVhVKXjHEErF00rF6UxnvScVe27F5RDsD7bn/JW PUbiaXGscm0quPWpaIWqY5nzD+DsryaDg3QXg60Rnb+I9dRkKuewBr7XkQ2wxfgdh5 q065xn6oL3CPVVK4aUpAVxt/dVOa0QKaQl876YM+ahKuZSu+ynUVO0mZU6h6F+62yQ 91C+xSFoSRPIcb2NcVGfZIW2mwJX1BqIlLtJqO8DmHis4H8O3o3T38h4Mlt/IdXTZw C/ShAYB5yM8hA== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 69F946895C; Mon, 8 Dec 2025 05:40:15 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Mon, 8 Dec 2025 05:39:50 -0700 Message-ID: <20251208124001.775057-2-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251208124001.775057-1-sjg@u-boot.org> References: <20251208124001.775057-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: 3ZDETXIAJRYP7GYL3S7UAT6GMFSRDCFR X-Message-ID-Hash: 3ZDETXIAJRYP7GYL3S7UAT6GMFSRDCFR X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 1/7] luks: Correct condition for calling handle_encrypted() List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Use CONFIG_BLK_LUKS instead of CONFIG_LUKS, which does not exist. This allows the test to pass. Signed-off-by: Simon Glass --- boot/bootctl/logic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootctl/logic.c b/boot/bootctl/logic.c index 2ed106628e7..471e38e238c 100644 --- a/boot/bootctl/logic.c +++ b/boot/bootctl/logic.c @@ -903,7 +903,7 @@ static int logic_poll(struct udevice *dev) return log_msg_ret("gos", -ENOENT); /* If encrypted, handle pass entry and unlock */ - if (IS_ENABLED(CONFIG_LUKS) && + if (IS_ENABLED(CONFIG_BLK_LUKS) && (os->bflow.flags & BOOTFLOWF_ENCRYPTED)) { ret = handle_encrypted(dev, os, seq); if (ret)