From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 2B58E740032 for ; Tue, 16 Jan 2024 15:42:40 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=c1RTFwu5pnzCmOn5ADMBAej1CUUOhb1rl6Xcd+VIpAA=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1705419758; v=1; b=lV8ypj1A8BnOEaKCeYtnGlM5t/FFBYNTSQv7KuIOBa21+w/Ufxddf2l5QLnrX3S/ot8IcFYk WqgAyQT7arvCtUEPKZ/ea6L92yMp0Zm3CLII8j1cOgz8tfU3vLWltHVwCzjmEiVD35hfpgtAmgM RsY1IdKmWbjIMa6wPBSDY4vQ= X-Received: by 127.0.0.2 with SMTP id R9DwYY7687511xqP9kBJoDus; Tue, 16 Jan 2024 07:42:38 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web11.18487.1705419758244119157 for ; Tue, 16 Jan 2024 07:42:38 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-55-aQMuwyVyNOGr94gvXFVQng-1; Tue, 16 Jan 2024 10:42:31 -0500 X-MC-Unique: aQMuwyVyNOGr94gvXFVQng-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BF7501005055 for ; Tue, 16 Jan 2024 15:42:30 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.193.155]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 793131C060AF; Tue, 16 Jan 2024 15:42:30 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 7B4E01800DC7; Tue, 16 Jan 2024 16:42:29 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Oliver Steffen , Gerd Hoffmann Subject: [edk2-devel] [PATCH 1/2] OvmfPkg: remove TPM1_ENABLE build option Date: Tue, 16 Jan 2024 16:42:28 +0100 Message-ID: <20240116154229.554679-2-kraxel@redhat.com> In-Reply-To: <20240116154229.554679-1-kraxel@redhat.com> References: <20240116154229.554679-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Wf5EKHesR4GPEIMmuNRuEBOux7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=lV8ypj1A; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Signed-off-by: Gerd Hoffmann --- OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc | 6 ------ OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc | 5 ----- OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc | 3 --- OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc | 9 --------- OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc | 6 ------ OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc | 3 --- OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc | 5 ----- OvmfPkg/PlatformCI/ReadMe.md | 2 +- 8 files changed, 1 insertion(+), 38 deletions(-) diff --git a/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc index 75ae09571e8c..eef20b77149a 100644 --- a/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc +++ b/OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc @@ -15,12 +15,6 @@ NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf } SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf -!if $(TPM1_ENABLE) == TRUE - SecurityPkg/Tcg/TcgDxe/TcgDxe.inf { - - Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf - } -!endif SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf { TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLib/PeiDxeTpmPlatformHierarchyLib.inf diff --git a/OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc index fa486eed82d2..b91f29e5a64b 100644 --- a/OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc +++ b/OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc @@ -4,12 +4,7 @@ !if $(TPM2_ENABLE) == TRUE OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf -!if $(TPM1_ENABLE) == TRUE - OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf - SecurityPkg/Tcg/TcgPei/TcgPei.inf -!else OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -!endif SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf { HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf diff --git a/OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc b/OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc index a65564d8d9d2..ad3740a4737a 100644 --- a/OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc +++ b/OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc @@ -3,6 +3,3 @@ ## DEFINE TPM2_ENABLE = FALSE - - # has no effect unless TPM2_ENABLE == TRUE - DEFINE TPM1_ENABLE = TRUE diff --git a/OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc b/OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc index b97244695b52..e02a5d02d1a5 100644 --- a/OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc +++ b/OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc @@ -4,9 +4,6 @@ [LibraryClasses] !if $(TPM2_ENABLE) == TRUE -!if $(TPM1_ENABLE) == TRUE - Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf -!endif Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf @@ -27,16 +24,10 @@ [LibraryClasses] [LibraryClasses.common.PEIM] !if $(TPM2_ENABLE) == TRUE BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf -!if $(TPM1_ENABLE) == TRUE - Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf -!endif Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf !endif [LibraryClasses.common.DXE_DRIVER] !if $(TPM2_ENABLE) == TRUE -!if $(TPM1_ENABLE) == TRUE - Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf -!endif Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf !endif diff --git a/OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc b/OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc index 89455feca4d9..c40d6b0a0e78 100644 --- a/OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc +++ b/OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc @@ -2,12 +2,6 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent ## -!if $(TPM2_ENABLE) == TRUE -!if $(TPM1_ENABLE) == TRUE - NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf -!endif -!endif - !if $(TPM2_ENABLE) == TRUE || $(CC_MEASUREMENT_ENABLE) == TRUE # # DxeTpm2MeasureBootLib provides security service of TPM2 measure boot and diff --git a/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc b/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc index 7fc2bf8590a4..bd0be8fedbd5 100644 --- a/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc +++ b/OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc @@ -3,9 +3,6 @@ ## !if $(TPM2_ENABLE) == TRUE -!if $(TPM1_ENABLE) == TRUE -INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf -!endif INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf diff --git a/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc b/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc index 9f8b9bdd5bed..add012afab67 100644 --- a/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc +++ b/OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc @@ -4,12 +4,7 @@ !if $(TPM2_ENABLE) == TRUE INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf -!if $(TPM1_ENABLE) == TRUE -INF OvmfPkg/Tcg/Tcg2Config/Tcg12ConfigPei.inf -INF SecurityPkg/Tcg/TcgPei/TcgPei.inf -!else INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf -!endif INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf !endif diff --git a/OvmfPkg/PlatformCI/ReadMe.md b/OvmfPkg/PlatformCI/ReadMe.md index 10fa32ac489f..33b89df17bc5 100644 --- a/OvmfPkg/PlatformCI/ReadMe.md +++ b/OvmfPkg/PlatformCI/ReadMe.md @@ -14,7 +14,7 @@ supported and are described below. | IA32 | IA32 | OvmfPkgIa32.dsc | None | | X64 | X64 | OvmfPkgIa64.dsc | None | | IA32 X64 | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | None | -| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1 TPM1_ENABLE=1 TPM2_ENABLE=1 NETWORK_TLS_ENABLE=1 NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 | +| IA32 X64 Full | PEI-IA32 DXE-X64 | OvmfPkgIa32X64.dsc | SECURE_BOOT_ENABLE=1 SMM_REQUIRE=1 TPM2_ENABLE=1 NETWORK_TLS_ENABLE=1 NETWORK_IP6_ENABLE=1 NETWORK_HTTP_BOOT_ENABLE=1 | ## EDK2 Developer environment -- 2.43.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113913): https://edk2.groups.io/g/devel/message/113913 Mute This Topic: https://groups.io/mt/103764206/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-