\r
[FD.MEMFD]\r
BaseAddress = 0x800000\r
-Size = 0x800000\r
+Size = 0x900000\r
ErasePolarity = 1\r
BlockSize = 0x10000\r
-NumBlocks = 0x80\r
+NumBlocks = 0x90\r
\r
0x000000|0x006000\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize\r
\r
-0x020000|0x7E0000\r
-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
-FV = MAINFV\r
+0x006000|0x001000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize\r
+\r
+0x010000|0x008000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize\r
+\r
+0x018000|0x008000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdS3AcpiReservedMemoryBase|gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize\r
+\r
+0x020000|0x0E0000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize\r
+FV = PEIFV\r
+\r
+0x100000|0x800000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize\r
+FV = DXEFV\r
\r
################################################################################\r
\r
# SEC Phase modules\r
#\r
# The code in this FV handles the initial firmware startup, and\r
-# decompresses the MAINFV which handles the majority of the boot sequence.\r
+# decompresses the PEI and DXE FVs which handles the rest of the boot sequence.\r
#\r
INF OvmfPkg/Sec/SecMain.inf\r
\r
INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/Bin/ResetVector.inf\r
\r
################################################################################\r
-[FV.MAINFV]\r
+[FV.PEIFV]\r
BlockSize = 0x10000\r
FvAlignment = 16\r
ERASE_POLARITY = 1\r
READ_LOCK_CAP = TRUE\r
READ_LOCK_STATUS = TRUE\r
\r
-#\r
-# Files to be placed in MAIN FV\r
-#\r
-# This firmware volume will have files placed in it uncompressed,\r
-# and then then entire firmware volume will be compressed in a\r
-# single compression operation in order to achieve better\r
-# overall compression.\r
-#\r
-\r
APRIORI PEI {\r
INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
}\r
INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
INF OvmfPkg/PlatformPei/PlatformPei.inf\r
INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
-\r
-FILE FV_IMAGE = A4EF5A93-3F1B-4232-A1C4-F0910E6D1D9C {\r
- SECTION COMPRESS PI_NONE {\r
- SECTION FV_IMAGE = DXEFV\r
- }\r
-}\r
+INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf\r
\r
################################################################################\r
\r
INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
INF RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
+INF OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf\r
+INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf\r
+INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf\r
\r
INF RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
\r
\r
FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {\r
SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {\r
- SECTION FV_IMAGE = MAINFV\r
+ #\r
+ # These firmware volumes will have files placed in them uncompressed,\r
+ # and then both firmware volumes will be compressed in a single\r
+ # compression operation in order to achieve better overall compression.\r
+ #\r
+ SECTION FV_IMAGE = PEIFV\r
+ SECTION FV_IMAGE = DXEFV\r
}\r
}\r
\r