diff options
| author | Corvin Köhne <corvink@freebsd.org> | 2023-06-19 13:54:12 +0200 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-06-23 17:26:37 +0000 |
| commit | 57796711371d42d980d50bc9299972b109d09035 (patch) | |
| tree | d4915e1dce151fe38ce5b58770a76d905168d239 | |
| parent | c301291dc3360ea70c823ca0fff5e2bdd77174c9 (diff) | |
| download | edk2-57796711371d42d980d50bc9299972b109d09035.tar.gz edk2-57796711371d42d980d50bc9299972b109d09035.tar.bz2 edk2-57796711371d42d980d50bc9299972b109d09035.zip | |
OvmfPkg/Bhyve: include TPM driver
Bhyve will gain support for TPM emulation in the near future. Therefore,
prepare OVMF by copying all TPM driver used by qemu's OVMF DSC into the
bhyve OVMF DSC.
Signed-off-by: Corvin Köhne <corvink@FreeBSD.org>
Reviewed-by: Rebecca Cran <rebecca@bsdio.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | OvmfPkg/Bhyve/BhyveX64.dsc | 17 | ||||
| -rw-r--r-- | OvmfPkg/Bhyve/BhyveX64.fdf | 7 |
2 files changed, 22 insertions, 2 deletions
diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc index 7b974706f9..7fa40998ae 100644 --- a/OvmfPkg/Bhyve/BhyveX64.dsc +++ b/OvmfPkg/Bhyve/BhyveX64.dsc @@ -32,6 +32,8 @@ DEFINE SMM_REQUIRE = FALSE
DEFINE SOURCE_DEBUG_ENABLE = FALSE
+!include OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc
+
#
# Network definition
#
@@ -226,8 +228,7 @@ OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf
XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf
- Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibNull/DxeTcg2PhysicalPresenceLib.inf
- TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf
+!include OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc
[LibraryClasses.common]
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
@@ -564,12 +565,17 @@ gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00
+!include OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc
+
# MdeModulePkg resolution sets up the system display resolution
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|0
gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|0
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|0
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|0
+[PcdsDynamicHii]
+!include OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc
+
################################################################################
#
# Components Section - list of all EDK II Modules needed by this Platform.
@@ -609,6 +615,8 @@ <LibraryClasses>
}
+!include OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc
+
#
# DXE Phase modules
#
@@ -632,6 +640,7 @@ !if $(SECURE_BOOT_ENABLE) == TRUE
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf
!endif
+!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc
}
MdeModulePkg/Universal/EbcDxe/EbcDxe.inf
@@ -826,3 +835,7 @@ NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
}
+ #
+ # TPM support
+ #
+!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc
diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf index 3f6270c048..c62d575709 100644 --- a/OvmfPkg/Bhyve/BhyveX64.fdf +++ b/OvmfPkg/Bhyve/BhyveX64.fdf @@ -158,6 +158,8 @@ INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf INF OvmfPkg/Bhyve/SmmAccess/SmmAccessPei.inf
!endif
+!include OvmfPkg/Include/Fdf/OvmfTpmPei.fdf.inc
+
################################################################################
[FV.DXEFV]
@@ -335,6 +337,11 @@ INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
!endif
+#
+# TPM support
+#
+!include OvmfPkg/Include/Fdf/OvmfTpmDxe.fdf.inc
+
################################################################################
[FV.FVMAIN_COMPACT]
|