From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out02.mta.xmission.com (out02.mta.xmission.com [166.70.13.232]) by mx.groups.io with SMTP id smtpd.web11.10328.1623530633155821637 for ; Sat, 12 Jun 2021 13:43:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@bsdio.com header.s=xmission header.b=rKIbv4tA; spf=none, err=SPF record not found (domain: bsdio.com, ip: 166.70.13.232, mailfrom: rebecca@bsdio.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=simple/simple; d=bsdio.com; s=xmission; h=Subject:Content-Transfer-Encoding:MIME-Version:Message-Id:Date: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=yJRIUg4np7NK23LdeB172eEIVpWHhJA8XAdWv6l06do=; b=rKIbv4tABJb+QU8WFg+9hhZ84M QsY9j0uhIzT8R4WlP6ELR+ZKvkkUIS0fseh1JH0ahUC6RiEp4myXdDzvfdzG6+3U0H+DUZFfUCLqq tipAy3ycqppY6Lo0szhsB0ZN24bycSjnuUU0O3r4WWSnKEGsRkBMIYrJXmeuJm4klHTo=; Received: from in02.mta.xmission.com ([166.70.13.52]) by out02.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lsATr-00A9wW-1F; Sat, 12 Jun 2021 14:43:47 -0600 Received: from mta4.zcs.xmission.com ([166.70.13.68]) by in02.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lsATp-0087h2-OE; Sat, 12 Jun 2021 14:43:46 -0600 Received: from localhost (localhost [127.0.0.1]) by mta4.zcs.xmission.com (Postfix) with ESMTP id 7968550106B; Sat, 12 Jun 2021 14:43:45 -0600 (MDT) X-Amavis-Modified: Mail body modified (using disclaimer) - mta4.zcs.xmission.com Received: from mta4.zcs.xmission.com ([127.0.0.1]) by localhost (mta4.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id v71R94OzpQFz; Sat, 12 Jun 2021 14:43:45 -0600 (MDT) Received: from photon.int.bluestop.org (c-174-52-16-57.hsd1.ut.comcast.net [174.52.16.57]) by mta4.zcs.xmission.com (Postfix) with ESMTPSA id 347D6500F78; Sat, 12 Jun 2021 14:43:45 -0600 (MDT) From: "Rebecca Cran" To: Peter Grehan , Laszlo Ersek , Ard Biesheuvel , Jordan Justen Cc: Rebecca Cran , devel@edk2.groups.io Date: Sat, 12 Jun 2021 14:43:40 -0600 Message-Id: <20210612204340.52290-1-rebecca@bsdio.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-XM-SPF: eid=1lsATp-0087h2-OE;;;mid=<20210612204340.52290-1-rebecca@bsdio.com>;;;hst=in02.mta.xmission.com;;;ip=166.70.13.68;;;frm=rebecca@bsdio.com;;;spf=none X-SA-Exim-Connect-IP: 166.70.13.68 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa04.xmission.com X-Spam-Level: * X-Spam-Status: No, score=1.2 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE,T_TooManySym_01,TooManyTo_001,TooManyTo_002, TooManyTo_003 autolearn=disabled version=3.4.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * 0.5 TooManyTo_002 Multiple "To" Header Recipients 3x (uncommon) * 0.3 TooManyTo_001 Multiple "To" Header Recipients 2x (uncommon) * 0.6 TooManyTo_003 Multiple "To" Header Recipients 4x (uncommon) * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa04 1397; IP=ok Body=1 Fuz1=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: XMission; sa04 1397; IP=ok Body=1 Fuz1=1 X-Spam-Combo: *;Peter Grehan , Laszlo Ersek , Ard Biesheuvel , Jordan Justen X-Spam-Relay-Country: X-Spam-Timing: total 753 ms - load_scoreonly_sql: 0.06 (0.0%), signal_user_changed: 13 (1.7%), b_tie_ro: 11 (1.5%), parse: 1.87 (0.2%), extract_message_metadata: 28 (3.7%), get_uri_detail_list: 5 (0.7%), tests_pri_-1000: 8 (1.0%), tests_pri_-950: 1.65 (0.2%), tests_pri_-900: 1.28 (0.2%), tests_pri_-90: 119 (15.9%), check_bayes: 98 (13.0%), b_tokenize: 20 (2.6%), b_tok_get_all: 13 (1.7%), b_comp_prob: 2.9 (0.4%), b_tok_touch_all: 58 (7.7%), b_finish: 1.25 (0.2%), tests_pri_0: 568 (75.4%), check_dkim_signature: 0.81 (0.1%), check_dkim_adsp: 44 (5.8%), poll_dns_idle: 33 (4.4%), tests_pri_10: 2.0 (0.3%), tests_pri_500: 7 (0.9%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH] OvmfPkg/Bhyve: clean up TPM_ENABLE remnants X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Content-Transfer-Encoding: quoted-printable TPM support hasn't been tested and any lines in the .dsc and .fdf files that appear to show support are bogus. Remove them. This fixes https://bugzilla.tianocore.org/show_bug.cgi?id=3D3354 . Signed-off-by: Rebecca Cran --- OvmfPkg/Bhyve/BhyveX64.dsc | 64 -------------------- OvmfPkg/Bhyve/BhyveX64.fdf | 15 ----- 2 files changed, 79 deletions(-) diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc index d8792812ab..cbf896e89b 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -31,8 +31,6 @@ DEFINE SECURE_BOOT_ENABLE =3D FALSE=0D DEFINE SMM_REQUIRE =3D FALSE=0D DEFINE SOURCE_DEBUG_ENABLE =3D FALSE=0D - DEFINE TPM_ENABLE =3D FALSE=0D - DEFINE TPM_CONFIG_ENABLE =3D FALSE=0D =0D #=0D # Network definition=0D @@ -221,16 +219,8 @@ OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf=0D XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf=0D =0D -=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 - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasure= mentLib.inf=0D -!else=0D Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeT= cg2PhysicalPresenceLib.inf=0D TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurem= entLibNull.inf=0D -!endif=0D =0D [LibraryClasses.common]=0D BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf=0D @@ -292,11 +282,6 @@ CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuE= xceptionHandlerLib.inf=0D PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf=0D =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 -=0D MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/PeiMemEncryptSevLi= b.inf=0D =0D [LibraryClasses.common.DXE_CORE]=0D @@ -366,9 +351,6 @@ !endif=0D PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf=0D MpInitLib|UefiCpuPkg/Library/MpInitLibUp/MpInitLibUp.inf=0D -!if $(TPM_ENABLE) =3D=3D TRUE=0D - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.in= f=0D -!endif=0D =0D [LibraryClasses.common.UEFI_APPLICATION]=0D PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf=0D @@ -563,22 +545,12 @@ =0D gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00=0D =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 -=0D # MdeModulePkg resolution sets up the system display resolution=0D gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0=0D gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0=0D gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0=0D =0D -[PcdsDynamicHii]=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 -=0D ##########################################################################= ######=0D #=0D # Components Section - list of all EDK II Modules needed by this Platform.= =0D @@ -618,19 +590,6 @@ =0D }=0D =0D -!if $(TPM_ENABLE) =3D=3D TRUE=0D - OvmfPkg/Bhyve/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D - SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {=0D - =0D - HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCrypt= oRouterPei.inf=0D - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf= =0D - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf=0D - NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384= .inf=0D - NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf=0D - NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf=0D - }=0D -!endif=0D -=0D #=0D # DXE Phase modules=0D #=0D @@ -653,9 +612,6 @@ =0D !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE=0D NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf=0D -!endif=0D -!if $(TPM_ENABLE) =3D=3D TRUE=0D - NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib= .inf=0D !endif=0D }=0D =0D @@ -841,23 +797,3 @@ NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf=0D }=0D =0D -=0D - #=0D - # TPM support=0D - #=0D -!if $(TPM_ENABLE) =3D=3D TRUE=0D - SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {=0D - =0D - Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibR= outerDxe.inf=0D - NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf=0D - HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCrypt= oRouterDxe.inf=0D - NULL|SecurityPkg/Library/HashInstanceLibSha1/HashInstanceLibSha1.inf= =0D - NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256= .inf=0D - NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384= .inf=0D - NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512= .inf=0D - NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf=0D - }=0D -!if $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D - SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf=0D -!endif=0D -!endif=0D diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf index 3eff36dac1..fbd63a395a 100644 --- a/OvmfPkg/Bhyve/BhyveX64.fdf +++ b/OvmfPkg/Bhyve/BhyveX64.fdf @@ -158,11 +158,6 @@ INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2P= ei.inf INF OvmfPkg/Bhyve/SmmAccess/SmmAccessPei.inf=0D !endif=0D =0D -!if $(TPM_ENABLE) =3D=3D TRUE=0D -INF OvmfPkg/Bhyve/Tcg/Tcg2Config/Tcg2ConfigPei.inf=0D -INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf=0D -!endif=0D -=0D ##########################################################################= ######=0D =0D [FV.DXEFV]=0D @@ -333,16 +328,6 @@ INF MdeModulePkg/Universal/FaultTolerantWriteDxe/Faul= tTolerantWriteDxe.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf=0D !endif=0D =0D -#=0D -# TPM support=0D -#=0D -!if $(TPM_ENABLE) =3D=3D TRUE=0D -INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf=0D -!if $(TPM_CONFIG_ENABLE) =3D=3D TRUE=0D -INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf=0D -!endif=0D -!endif=0D -=0D ##########################################################################= ######=0D =0D [FV.FVMAIN_COMPACT]=0D --=20 2.32.0