From patchwork Mon Jan 30 14:41:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734152 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=iOzJV8+C; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5BZn0Wjqz1yhq for ; Tue, 31 Jan 2023 02:15:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D6BF685902; Mon, 30 Jan 2023 16:14:40 +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="iOzJV8+C"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EE626857FF; Mon, 30 Jan 2023 15:58:29 +0100 (CET) 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x135.google.com (mail-il1-x135.google.com [IPv6:2607:f8b0:4864:20::135]) (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 71A6C857F8 for ; Mon, 30 Jan 2023 15:58:19 +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-x135.google.com with SMTP id u7so3670672ilg.4 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=yGdHp4Yj/k1S2siYAILFwIOSm9SP+WPbnKArcdZ8i54=; b=iOzJV8+CUem++JfDNMlh5FN+P1NXz3qI/himmR8pgt4EqrNkfR8UFFsMojcrxg5uDM Ja5nYra6G94cL8mpFGarYEUF1wPK8bZcl2q8NbM6hNooZ56A1cN7aiH2z4/DbQjFioRj ms+FzCTItlUKVuWPKDIYIn7gi9dG1MMxEf4jI= 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=yGdHp4Yj/k1S2siYAILFwIOSm9SP+WPbnKArcdZ8i54=; b=ixdP0uZabNML3K+36oB+YHm2GnT/ZIcH05NT3YjvgEJiSQuOgM61vzNvmIFeInJZXU iRvgdksMlaOCHljo5WnDnhAT4c9sUC6RomGV3nyzcqq5KZWjhhjw1qzU8zdmdxQY+GJa iDJTELTBk6M418aPjs2JaWhmSXxJwpmP/mUslFbE0VbFkFpD3sEQkoo1GTNF2P6oiLwO nl2g8kAVSyCHFfzZDTP4m4ij8VRVlE/fFBy8IWdF7BxVTjQaYHTSFU8odph1t3L1+RCI Aot54wPyDzf+Cl0A3KFbl6Xs0Wb19t63zVFLAaGGzYyDa0GY/FwzdoH/zWrbxKBnkBxO mS4Q== X-Gm-Message-State: AO0yUKVo4Ue8WFOzlvOH1kmQ27idypR86S/x1KTspUkR4/jrbKrfHhXx V2cAydkJasMr5wQ0/Jt6GkTNFe7fW8z6Etui X-Google-Smtp-Source: AK7set9Vy6RByBvOmFNOVaBXSCHEPqaGH5SJJLs/tvfuH5I1whkxY3cpkbIHOfMK0DgxSuQ9iCNSfg== X-Received: by 2002:a05:6e02:2168:b0:310:eb06:cccc with SMTP id s8-20020a056e02216800b00310eb06ccccmr4718029ilv.28.1675090698076; Mon, 30 Jan 2023 06:58:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:58:17 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Ilias Apalodimas Subject: [PATCH 077/171] Correct SPL use of EFI_MM_COMM_TEE Date: Mon, 30 Jan 2023 07:41:50 -0700 Message-Id: <20230130144324.206208-78-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 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_MM_COMM_TEE defined in Kconfig Signed-off-by: Simon Glass --- cmd/eficonfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 47c04cf5363..46f652c35d6 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -2670,7 +2670,7 @@ static const struct eficonfig_item maintenance_menu_items[] = { {"Edit Boot Option", eficonfig_process_edit_boot_option}, {"Change Boot Order", eficonfig_process_change_boot_order}, {"Delete Boot Option", eficonfig_process_delete_boot_option}, -#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && CONFIG_IS_ENABLED(EFI_MM_COMM_TEE)) +#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && IS_ENABLED(CONFIG_EFI_MM_COMM_TEE)) {"Secure Boot Configuration", eficonfig_process_secure_boot_config}, #endif {"Quit", eficonfig_process_quit},