DEFINE SECURE_BOOT_ENABLE = FALSE\r
DEFINE SMM_REQUIRE = FALSE\r
DEFINE SOURCE_DEBUG_ENABLE = FALSE\r
- DEFINE TPM2_ENABLE = FALSE\r
- DEFINE TPM2_CONFIG_ENABLE = FALSE\r
+ DEFINE TPM_ENABLE = FALSE\r
+ DEFINE TPM_CONFIG_ENABLE = FALSE\r
+ DEFINE LOAD_X64_ON_IA32_ENABLE = FALSE\r
\r
#\r
# Network definition\r
XenHypercallLib|OvmfPkg/Library/XenHypercallLib/XenHypercallLib.inf\r
XenPlatformLib|OvmfPkg/Library/XenPlatformLib/XenPlatformLib.inf\r
\r
-!if $(TPM2_ENABLE) == TRUE\r
+!if $(TPM_ENABLE) == TRUE\r
+ Tpm12CommandLib|SecurityPkg/Library/Tpm12CommandLib/Tpm12CommandLib.inf\r
Tpm2CommandLib|SecurityPkg/Library/Tpm2CommandLib/Tpm2CommandLib.inf\r
Tcg2PhysicalPresenceLib|OvmfPkg/Library/Tcg2PhysicalPresenceLibQemu/DxeTcg2PhysicalPresenceLib.inf\r
Tcg2PpVendorLib|SecurityPkg/Library/Tcg2PpVendorLibNull/Tcg2PpVendorLibNull.inf\r
PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf\r
\r
-!if $(TPM2_ENABLE) == TRUE\r
+!if $(TPM_ENABLE) == TRUE\r
BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf\r
+ Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf\r
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2DeviceLibDTpm.inf\r
!endif\r
\r
PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf\r
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf\r
QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/DxeQemuFwCfgS3LibFwCfg.inf\r
-!if $(TPM2_ENABLE) == TRUE\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+ QemuLoadImageLib|OvmfPkg/Library/GenericQemuLoadImageLib/GenericQemuLoadImageLib.inf\r
+!else\r
+ QemuLoadImageLib|OvmfPkg/Library/X86QemuLoadImageLib/X86QemuLoadImageLib.inf\r
+!endif\r
+!if $(TPM_ENABLE) == TRUE\r
+ Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibTcg/Tpm12DeviceLibTcg.inf\r
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibTcg2/Tpm2DeviceLibTcg2.inf\r
!endif\r
\r
!endif\r
!if $(SMM_REQUIRE) == TRUE\r
gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE\r
- gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE\r
+ gUefiCpuPkgTokenSpaceGuid.PcdCpuHotPlugSupport|TRUE\r
gEfiMdeModulePkgTokenSpaceGuid.PcdEnableVariableRuntimeCache|FALSE\r
!endif\r
\r
\r
gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00\r
\r
-!if $(TPM2_ENABLE) == TRUE\r
+!if $(TPM_ENABLE) == TRUE\r
gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid|{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}\r
!endif\r
\r
[PcdsDynamicHii]\r
-!if $(TPM2_ENABLE) == TRUE && $(TPM2_CONFIG_ENABLE) == TRUE\r
+!if $(TPM_ENABLE) == TRUE && $(TPM_CONFIG_ENABLE) == TRUE\r
gEfiSecurityPkgTokenSpaceGuid.PcdTcgPhysicalPresenceInterfaceVer|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x0|"1.3"|NV,BS\r
gEfiSecurityPkgTokenSpaceGuid.PcdTpm2AcpiTableRev|L"TCG2_VERSION"|gTcg2ConfigFormSetGuid|0x8|3|NV,BS\r
!endif\r
!endif\r
UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
\r
-!if $(TPM2_ENABLE) == TRUE\r
+!if $(TPM_ENABLE) == TRUE\r
OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
+ SecurityPkg/Tcg/TcgPei/TcgPei.inf\r
SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf {\r
<LibraryClasses>\r
HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRouterPei.inf\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
!endif\r
-!if $(TPM2_ENABLE) == TRUE\r
+!if $(TPM_ENABLE) == TRUE\r
+ NULL|SecurityPkg/Library/DxeTpmMeasureBootLib/DxeTpmMeasureBootLib.inf\r
NULL|SecurityPkg/Library/DxeTpm2MeasureBootLib/DxeTpm2MeasureBootLib.inf\r
!endif\r
}\r
NULL|OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUiLib.inf\r
!endif\r
}\r
+ OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf\r
OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
OvmfPkg/Virtio10Dxe/Virtio10.inf\r
OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
}\r
!endif\r
+ OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {\r
+ <PcdsFixedAtBuild>\r
+ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
+ }\r
ShellPkg/Application/Shell/Shell.inf {\r
<LibraryClasses>\r
ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf\r
!if $(SMM_REQUIRE) == TRUE\r
OvmfPkg/SmmAccess/SmmAccess2Dxe.inf\r
OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf\r
- UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf\r
+ OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf\r
\r
#\r
# SMM Initial Program Load (a DXE_RUNTIME_DRIVER)\r
#\r
# Privileged drivers (DXE_SMM_DRIVER modules)\r
#\r
+ OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf\r
UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf\r
MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf {\r
<LibraryClasses>\r
}\r
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf {\r
<LibraryClasses>\r
- SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf\r
+ SmmCpuPlatformHookLib|OvmfPkg/Library/SmmCpuPlatformHookLibQemu/SmmCpuPlatformHookLibQemu.inf\r
SmmCpuFeaturesLib|OvmfPkg/Library/SmmCpuFeaturesLib/SmmCpuFeaturesLib.inf\r
}\r
\r
!endif\r
\r
#\r
- # TPM2 support\r
+ # TPM support\r
#\r
-!if $(TPM2_ENABLE) == TRUE\r
+!if $(TPM_ENABLE) == TRUE\r
SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf {\r
<LibraryClasses>\r
Tpm2DeviceLib|SecurityPkg/Library/Tpm2DeviceLibRouter/Tpm2DeviceLibRouterDxe.inf\r
NULL|SecurityPkg/Library/HashInstanceLibSha512/HashInstanceLibSha512.inf\r
NULL|SecurityPkg/Library/HashInstanceLibSm3/HashInstanceLibSm3.inf\r
}\r
-!if $(TPM2_CONFIG_ENABLE) == TRUE\r
+!if $(TPM_CONFIG_ENABLE) == TRUE\r
SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
!endif\r
+ SecurityPkg/Tcg/TcgDxe/TcgDxe.inf {\r
+ <LibraryClasses>\r
+ Tpm12DeviceLib|SecurityPkg/Library/Tpm12DeviceLibDTpm/Tpm12DeviceLibDTpm.inf\r
+ }\r
+!endif\r
+\r
+!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE\r
+ OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf\r
!endif\r