################################################################################\r
\r
[Defines]\r
-!include OvmfPkg.fdf.inc\r
+!include OvmfPkgDefines.fdf.inc\r
\r
#\r
# Build the variable store and the firmware code as one unified flash device\r
\r
[FD.MEMFD]\r
BaseAddress = $(MEMFD_BASE_ADDRESS)\r
-Size = 0xC00000\r
+Size = 0xD00000\r
ErasePolarity = 1\r
BlockSize = 0x10000\r
-NumBlocks = 0xC0\r
+NumBlocks = 0xD0\r
\r
0x000000|0x006000\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize\r
FV = PEIFV\r
\r
-0x100000|0xB00000\r
+0x100000|0xC00000\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize\r
FV = DXEFV\r
\r
INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf\r
!if $(SMM_REQUIRE) == TRUE\r
+INF MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf\r
+INF MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r
INF OvmfPkg/SmmAccess/SmmAccessPei.inf\r
!endif\r
INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
\r
-!if $(TPM2_ENABLE) == TRUE\r
+!if $(TPM_ENABLE) == TRUE\r
INF OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
+INF SecurityPkg/Tcg/TcgPei/TcgPei.inf\r
INF SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r
!endif\r
\r
INF OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf\r
INF OvmfPkg/XenBusDxe/XenBusDxe.inf\r
INF OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
+!if $(PVSCSI_ENABLE) == TRUE\r
+INF OvmfPkg/PvScsiDxe/PvScsiDxe.inf\r
+!endif\r
+!if $(MPT_SCSI_ENABLE) == TRUE\r
+INF OvmfPkg/MptScsiDxe/MptScsiDxe.inf\r
+!endif\r
+!if $(LSI_SCSI_ENABLE) == TRUE\r
+INF OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf\r
+!endif\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
INF MdeModulePkg/Universal/BdsDxe/BdsDxe.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/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
\r
INF OvmfPkg/SioBusDxe/SioBusDxe.inf\r
-!ifndef $(SOURCE_DEBUG_ENABLE)\r
+!if $(SOURCE_DEBUG_ENABLE) == FALSE\r
INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
!endif\r
INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
\r
INF FatPkg/EnhancedFatDxe/Fat.inf\r
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
+INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf\r
\r
!if $(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
INF ShellPkg/Application/Shell/Shell.inf\r
\r
!if $(SMM_REQUIRE) == TRUE\r
INF OvmfPkg/SmmAccess/SmmAccess2Dxe.inf\r
INF OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf\r
-INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf\r
+INF OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf\r
INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf\r
INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf\r
+INF OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf\r
INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf\r
INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf\r
INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf\r
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
!endif\r
\r
-!if $(TPM2_ENABLE) == TRUE\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
-!if $(TPM2_CONFIG_ENABLE) == TRUE\r
+!if $(TPM_CONFIG_ENABLE) == TRUE\r
INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
!endif\r
!endif\r
}\r
}\r
\r
-!include DecomprScratchEnd.fdf.inc\r
+!include FvmainCompactScratchEnd.fdf.inc\r
\r
################################################################################\r
\r