0x007000|0x001000\r
gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize\r
\r
+0x008000|0x001000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaSize\r
+\r
0x010000|0x010000\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize\r
\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize\r
FV = DXEFV\r
\r
+##########################################################################################\r
+# Set the SEV-ES specific work area PCDs (used for all forms of SEV since the\r
+# the SEV STATUS MSR is now saved in the work area)\r
+#\r
+SET gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase = $(MEMFD_BASE_ADDRESS) + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfConfidentialComputingWorkAreaHeader\r
+SET gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaSize = gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaSize - gUefiOvmfPkgTokenSpaceGuid.PcdOvmfConfidentialComputingWorkAreaHeader\r
+##########################################################################################\r
+\r
################################################################################\r
\r
[FV.SECFV]\r
!endif\r
INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
\r
-!if $(TPM_ENABLE) == TRUE\r
-INF OvmfPkg/Tcg/TpmMmioSevDecryptPei/TpmMmioSevDecryptPei.inf\r
-INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
-INF SecurityPkg/Tcg/TcgPei/TcgPei.inf\r
-INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r
-INF SecurityPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf\r
-!endif\r
+!include OvmfPkg/OvmfTpmPei.fdf.inc\r
\r
################################################################################\r
\r
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
-INF OvmfPkg/8259InterruptControllerDxe/8259.inf\r
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
-INF OvmfPkg/8254TimerDxe/8254Timer.inf\r
+!ifdef $(CSM_ENABLE)\r
+ INF OvmfPkg/8259InterruptControllerDxe/8259.inf\r
+ INF OvmfPkg/8254TimerDxe/8254Timer.inf\r
+!else\r
+ INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf\r
+!endif\r
INF OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
INF OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
INF MdeModulePkg/Application/UiApp/UiApp.inf\r
INF OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf\r
INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
-INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r
INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
\r
INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
-INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
+INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf\r
INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf\r
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf\r
\r
-!if $(TOOL_CHAIN_TAG) != "XCODE5"\r
+!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"\r
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf\r
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf\r
!endif\r
+!if $(BUILD_SHELL) == TRUE\r
INF ShellPkg/Application/Shell/Shell.inf\r
+!endif\r
\r
INF MdeModulePkg/Logo/LogoDxe.inf\r
\r
#\r
# TPM support\r
#\r
-!if $(TPM_ENABLE) == TRUE\r
-INF SecurityPkg/Tcg/TcgDxe/TcgDxe.inf\r
-INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
-INF SecurityPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf\r
-!if $(TPM_CONFIG_ENABLE) == TRUE\r
-INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
-!endif\r
-!endif\r
+!include OvmfPkg/OvmfTpmDxe.fdf.inc\r
\r
!if $(LOAD_X64_ON_IA32_ENABLE) == TRUE\r
INF OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf\r