UefiCpuPkg/MpInitLib: Remove Executable attribute from MpLib.h

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.fdf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index d67d3368764272438b066c650f2d8f1ce17e35cb..f71134a65931e95e57fc5b76a81f62b7ea417182 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -11,7 +11,7 @@
 ################################################################################\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
@@ -62,10 +62,10 @@ FV = SECFV
 \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
@@ -83,7 +83,7 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.P
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize\r
 FV = PEIFV\r
 \r
-0x100000|0xB00000\r
+0x100000|0xC00000\r
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize\r
 FV = DXEFV\r
 \r
@@ -155,6 +155,8 @@ INF  OvmfPkg/PlatformPei/PlatformPei.inf
 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
@@ -229,6 +231,12 @@ INF  OvmfPkg/VirtioRngDxe/VirtioRng.inf
 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
 \r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
   INF  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
@@ -244,6 +252,7 @@ INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
 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
@@ -326,9 +335,10 @@ INF  OvmfPkg/IoMmuDxe/IoMmuDxe.inf
 !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
@@ -396,7 +406,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
    }\r
  }\r
 \r
-!include DecomprScratchEnd.fdf.inc\r
+!include FvmainCompactScratchEnd.fdf.inc\r
 \r
 ################################################################################\r
 \r