From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.120]) by mx.groups.io with SMTP id smtpd.web12.6025.1581599557450100985 for ; Thu, 13 Feb 2020 05:12:37 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UoWweso5; spf=pass (domain: redhat.com, ip: 207.211.31.120, mailfrom: marcandre.lureau@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581599556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2PVknpPvtRgojAVDAGI7yb5CONNU56LrpwzqnH2b/y8=; b=UoWweso5ypLuER//U+b+iG7RWCW//FU4E1ujJTOYKOzeittqbbUyeAFzyV2g7gEpVNTF8n CdyaGbAedHAoPV5A7+U3hFDKIs8cR5VuayQFekXVd/H73szPkJTK/fjtXGUxM09I6fkLW9 vhmJrTbMU/ZIwp/NcK05P0eiTAjBy0I= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-227-7l8u3H0mPQOi2p-WU5h9Tg-1; Thu, 13 Feb 2020 08:12:33 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA508107ACC5; Thu, 13 Feb 2020 13:12:31 +0000 (UTC) Received: from localhost (ovpn-112-66.ams2.redhat.com [10.36.112.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6121D5C1C3; Thu, 13 Feb 2020 13:12:28 +0000 (UTC) From: marcandre.lureau@redhat.com To: edk2-devel@lists.01.org, devel@edk2.groups.io Cc: stefanb@linux.ibm.com, lersek@redhat.com, simon.hardy@itdev.co.uk, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 1/3] Ovmf: rename TPM2 config prefix to TPM Date: Thu, 13 Feb 2020 14:12:20 +0100 Message-Id: <20200213131222.157700-2-marcandre.lureau@redhat.com> In-Reply-To: <20200213131222.157700-1-marcandre.lureau@redhat.com> References: <20200213131222.157700-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: 7l8u3H0mPQOi2p-WU5h9Tg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable From: Marc-Andr=C3=A9 Lureau A following patch is going to use the same configuration for TPM1.2 and TPM2.0, and it's simpler to support both than variable configurations. Signed-off-by: Marc-Andr=C3=A9 Lureau --- OvmfPkg/OvmfPkgIa32.dsc | 24 ++++++++++++------------ OvmfPkg/OvmfPkgIa32.fdf | 8 ++++---- OvmfPkg/OvmfPkgIa32X64.dsc | 24 ++++++++++++------------ OvmfPkg/OvmfPkgIa32X64.fdf | 8 ++++---- OvmfPkg/OvmfPkgX64.dsc | 24 ++++++++++++------------ OvmfPkg/OvmfPkgX64.fdf | 8 ++++---- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 19728f20b34e..38b013ad9543 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -31,8 +31,8 @@ DEFINE SECURE_BOOT_ENABLE =3D FALSE=0D DEFINE SMM_REQUIRE =3D FALSE=0D DEFINE SOURCE_DEBUG_ENABLE =3D FALSE=0D - DEFINE TPM2_ENABLE =3D FALSE=0D - DEFINE TPM2_CONFIG_ENABLE =3D FALSE=0D + DEFINE TPM_ENABLE =3D FALSE=0D + DEFINE TPM_CONFIG_ENABLE =3D FALSE=0D =20=0D #=0D # Network definition=0D @@ -205,7 +205,7 @@ XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf=0D XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf=0D Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeT= cg2PhysicalPresenceLib.inf=0D Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibN= ull.inf=0D @@ -279,7 +279,7 @@ PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf=0D QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf=0D Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.in= f=0D !endif=0D @@ -360,7 +360,7 @@ PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf=0D MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf=0D QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf= =0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.in= f=0D !endif=0D =20=0D @@ -575,12 +575,12 @@ =20=0D gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00= =0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00= , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}= =0D !endif=0D =20=0D [PcdsDynamicHii]=0D -!if $(TPM2_ENABLE) =3D=3D TRUE && $(TPM2_CONFIG_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE && $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_= VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS=0D gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2C= onfigFormSetGuid|0x8|3|NV,BS=0D !endif=0D @@ -631,7 +631,7 @@ !endif=0D UefiCpuPkg/CpuMpPei/CpuMpPei.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {=0D =0D @@ -667,7 +667,7 @@ !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE=0D NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf=0D !endif=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib= .inf=0D !endif=0D }=0D @@ -910,9 +910,9 @@ !endif=0D =20=0D #=0D - # TPM2 support=0D + # TPM support=0D #=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {=0D =0D Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibR= outerDxe.inf=0D @@ -924,7 +924,7 @@ NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf=0D NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf= =0D }=0D -!if $(TPM2_CONFIG_ENABLE) =3D=3D TRUE=0D +!if $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf=0D !endif=0D !endif=0D diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 63607551ed75..2c7d6cccdfb0 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -159,7 +159,7 @@ INF OvmfPkg/SmmAccess/SmmAccessPei.inf !endif=0D INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf=0D !endif=0D @@ -344,11 +344,11 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/Varia= bleRuntimeDxe.inf !endif=0D =20=0D #=0D -# TPM2 support=0D +# TPM support=0D #=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf=0D -!if $(TPM2_CONFIG_ENABLE) =3D=3D TRUE=0D +!if $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf=0D !endif=0D !endif=0D diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 3c0c229e3a72..e075f0766935 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -31,8 +31,8 @@ DEFINE SECURE_BOOT_ENABLE =3D FALSE=0D DEFINE SMM_REQUIRE =3D FALSE=0D DEFINE SOURCE_DEBUG_ENABLE =3D FALSE=0D - DEFINE TPM2_ENABLE =3D FALSE=0D - DEFINE TPM2_CONFIG_ENABLE =3D FALSE=0D + DEFINE TPM_ENABLE =3D FALSE=0D + DEFINE TPM_CONFIG_ENABLE =3D FALSE=0D =20=0D #=0D # Network definition=0D @@ -210,7 +210,7 @@ XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf=0D XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf=0D Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeT= cg2PhysicalPresenceLib.inf=0D Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibN= ull.inf=0D @@ -284,7 +284,7 @@ PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf=0D QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf=0D Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.in= f=0D !endif=0D @@ -365,7 +365,7 @@ PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf=0D MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf=0D QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf= =0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.in= f=0D !endif=0D =20=0D @@ -587,12 +587,12 @@ =20=0D gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00= =0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00= , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}= =0D !endif=0D =20=0D [PcdsDynamicHii]=0D -!if $(TPM2_ENABLE) =3D=3D TRUE && $(TPM2_CONFIG_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE && $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_= VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS=0D gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2C= onfigFormSetGuid|0x8|3|NV,BS=0D !endif=0D @@ -643,7 +643,7 @@ !endif=0D UefiCpuPkg/CpuMpPei/CpuMpPei.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {=0D =0D @@ -680,7 +680,7 @@ !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE=0D NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf=0D !endif=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib= .inf=0D !endif=0D }=0D @@ -924,9 +924,9 @@ !endif=0D =20=0D #=0D - # TPM2 support=0D + # TPM support=0D #=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {=0D =0D Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibR= outerDxe.inf=0D @@ -938,7 +938,7 @@ NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf=0D NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf= =0D }=0D -!if $(TPM2_CONFIG_ENABLE) =3D=3D TRUE=0D +!if $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf=0D !endif=0D !endif=0D diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 0488e5d95ffe..6a4c9089ab58 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -159,7 +159,7 @@ INF OvmfPkg/SmmAccess/SmmAccessPei.inf !endif=0D INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf=0D !endif=0D @@ -351,11 +351,11 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/Varia= bleRuntimeDxe.inf !endif=0D =20=0D #=0D -# TPM2 support=0D +# TPM support=0D #=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf=0D -!if $(TPM2_CONFIG_ENABLE) =3D=3D TRUE=0D +!if $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf=0D !endif=0D !endif=0D diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index f6c1d8d228c6..3b1ebf123b51 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -31,8 +31,8 @@ DEFINE SECURE_BOOT_ENABLE =3D FALSE=0D DEFINE SMM_REQUIRE =3D FALSE=0D DEFINE SOURCE_DEBUG_ENABLE =3D FALSE=0D - DEFINE TPM2_ENABLE =3D FALSE=0D - DEFINE TPM2_CONFIG_ENABLE =3D FALSE=0D + DEFINE TPM_ENABLE =3D FALSE=0D + DEFINE TPM_CONFIG_ENABLE =3D FALSE=0D =20=0D #=0D # Network definition=0D @@ -210,7 +210,7 @@ XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf=0D XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf=0D Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeT= cg2PhysicalPresenceLib.inf=0D Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibN= ull.inf=0D @@ -284,7 +284,7 @@ PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf=0D QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf=0D Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.in= f=0D !endif=0D @@ -365,7 +365,7 @@ PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf=0D MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf=0D QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf= =0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.in= f=0D !endif=0D =20=0D @@ -586,12 +586,12 @@ =20=0D gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00= =0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00= , 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}= =0D !endif=0D =20=0D [PcdsDynamicHii]=0D -!if $(TPM2_ENABLE) =3D=3D TRUE && $(TPM2_CONFIG_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE && $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_= VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS=0D gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2C= onfigFormSetGuid|0x8|3|NV,BS=0D !endif=0D @@ -642,7 +642,7 @@ !endif=0D UefiCpuPkg/CpuMpPei/CpuMpPei.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {=0D =0D @@ -678,7 +678,7 @@ !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE=0D NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf=0D !endif=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib= .inf=0D !endif=0D }=0D @@ -922,9 +922,9 @@ !endif=0D =20=0D #=0D - # TPM2 support=0D + # TPM support=0D #=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {=0D =0D Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibR= outerDxe.inf=0D @@ -936,7 +936,7 @@ NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf=0D NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf= =0D }=0D -!if $(TPM2_CONFIG_ENABLE) =3D=3D TRUE=0D +!if $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf=0D !endif=0D !endif=0D diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 0488e5d95ffe..6a4c9089ab58 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -159,7 +159,7 @@ INF OvmfPkg/SmmAccess/SmmAccessPei.inf !endif=0D INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf=0D =20=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf=0D !endif=0D @@ -351,11 +351,11 @@ INF MdeModulePkg/Universal/Variable/RuntimeDxe/Varia= bleRuntimeDxe.inf !endif=0D =20=0D #=0D -# TPM2 support=0D +# TPM support=0D #=0D -!if $(TPM2_ENABLE) =3D=3D TRUE=0D +!if $(TPM_ENABLE) =3D=3D TRUE=0D INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf=0D -!if $(TPM2_CONFIG_ENABLE) =3D=3D TRUE=0D +!if $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf=0D !endif=0D !endif=0D --=20 2.25.0.rc2.1.g09a9a1a997