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 AAE53C54EAA for ; Mon, 30 Jan 2023 15:15:56 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A787085810; Mon, 30 Jan 2023 16:14:47 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="CkcCB1NL"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D0B92857F7; Mon, 30 Jan 2023 15:58:29 +0100 (CET) Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) (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 0C99B857F6 for ; Mon, 30 Jan 2023 15:58:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x134.google.com with SMTP id d10so5180539ilc.12 for ; Mon, 30 Jan 2023 06:58:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=JEXYmypyGx9ODH2PiJBjnpNYqu+xdN5zshEgHUVjjZQ=; b=CkcCB1NLql4cWgzjRftoStwe+MMyrH6X3QkBF1Y2Ei4qeDlQ31oY37vmI0iqIO/rjE f1F9Zvq/FsfZuflybUAN3SFbOc5025HsXjZn2Q2hxsa/yo9BGLxzbd6lmmBIBG8GYVZ7 f2hXyN54JLcNBM6TUY6dOe8R2vicvF7z8kYV4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=JEXYmypyGx9ODH2PiJBjnpNYqu+xdN5zshEgHUVjjZQ=; b=6qcpDJ6s4c809ZFhQf8yd+BlCBu/3j9g/UvBTGwwuR6+6zukumxXHFwmarDgLq38up tYpb9qPiR5cgxDyL86lsW4o05AMEQaFtfY5HPHsN+nO06/IF5BJcjG+f7ohKaDFZ3hHf rKcrNJX117rWstltPg/zaqfB8klgpmJGYWiusoja7Y1o4H/LjAR6fbXmdjf7/jQQ2sBO jPLM1HugZ1LYFkbjplIFWY7LiNT7c3sojDuAWLOSRyLzm1O678NHBpumiGXjUKtiORwU zJvLoKj+AvOZqDx58MY6/E0N83+8euDlKFkl7WgKkZkV3e4sPkGffTIPJo+ALWAIxrH0 A1bQ== X-Gm-Message-State: AO0yUKVBJhYyF1Is7J55rTU94gToQw4+sdgV9EGZMDoNBDEYXFKTn33X FXMHoPHwHfB3JlSHjtzpa3IXxI/iM7W+Qhi5 X-Google-Smtp-Source: AK7set+uoAw7jEvRfbI4LTX6Pu1eKGee9snAtHNF1bRMsWBg6fMnnHqqbJRKWdJjqWIOS6eG+S9elg== X-Received: by 2002:a05:6e02:1b0a:b0:310:9e82:e6f9 with SMTP id i10-20020a056e021b0a00b003109e82e6f9mr19870236ilv.17.1675090699523; Mon, 30 Jan 2023 06:58:19 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:19 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 079/171] Correct SPL use of EFI_TCG2_PROTOCOL Date: Mon, 30 Jan 2023 07:41:52 -0700 Message-Id: <20230130144324.206208-80-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This converts 1 usage of this option to the non-SPL form, since there is no SPL_EFI_TCG2_PROTOCOL defined in Kconfig Signed-off-by: Simon Glass --- lib/efi_loader/efi_image_loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index eaf75a5803d..26df0da16c9 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -938,7 +938,7 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, goto err; } -#if CONFIG_IS_ENABLED(EFI_TCG2_PROTOCOL) +#if IS_ENABLED(CONFIG_EFI_TCG2_PROTOCOL) /* Measure an PE/COFF image */ ret = tcg2_measure_pe_image(efi, efi_size, handle, loaded_image_info); if (ret == EFI_SECURITY_VIOLATION) { -- 2.39.1.456.gfc5497dd1b-goog