Here is a patch that by default keeps the current 1MB FD sizes. If FD_SIZE_2MB is...

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.fdf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 490829844855241227b1d02794d8309ccdff8181..d74043dfc78c19a39bd13a44c841971626f095fe 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -14,6 +14,7 @@
 ##\r
 \r
 ################################################################################\r
+!ifndef $(FD_SIZE_2MB)\r
 [FD.OVMF]\r
 BaseAddress   = 0xFFF00000\r
 Size          = 0x00100000\r
@@ -21,22 +22,36 @@ ErasePolarity = 1
 BlockSize     = 0x1000\r
 NumBlocks     = 0x100\r
 \r
-0x00000000|0x000EC000\r
+0x00000000|0x000E6000\r
 FV = FVMAIN_COMPACT\r
 \r
-0x000EC000|0x14000\r
+0x000E6000|0x1A000\r
 FV = SECFV\r
+!else\r
+[FD.OVMF]\r
+BaseAddress   = 0xFFE00000\r
+Size          = 0x00200000\r
+ErasePolarity = 1\r
+BlockSize     = 0x1000\r
+NumBlocks     = 0x200\r
+\r
+0x00000000|0x001CC000\r
+FV = FVMAIN_COMPACT\r
+\r
+0x001CC000|0x34000\r
+FV = SECFV\r
+!endif\r
 \r
 ################################################################################\r
 \r
 [FD.MEMFD]\r
 BaseAddress   = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase\r
-Size          = 0x500000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
+Size          = 0x600000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
-NumBlocks     = 0x50\r
+NumBlocks     = 0x60\r
 \r
-0x0|0x500000\r
+0x0|0x600000\r
 FV = MAINFV\r
 \r
 ################################################################################\r
@@ -170,7 +185,7 @@ INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
 \r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
   INF  SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf\r
-  INF  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+  INF  OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
 !else\r
   INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
 !endif\r
@@ -210,7 +225,7 @@ INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
 INF  OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
 \r
 INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
-INF  MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
+INF  OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
 INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
 \r
 INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
@@ -266,6 +281,8 @@ INF  IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
 INF  RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf\r
 !endif\r
 \r
+INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
+\r
 ################################################################################\r
 \r
 [FV.FVMAIN_COMPACT]\r
@@ -354,7 +371,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     UI        STRING="$(MODULE_NAME)" Optional\r
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
-  \r
+\r
 [Rule.Common.UEFI_APPLICATION]\r
   FILE APPLICATION = $(NAMED_GUID) {\r
     PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
@@ -368,7 +385,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     UI        STRING="$(MODULE_NAME)" Optional\r
     VERSION   STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
-  \r
+\r
 [Rule.Common.USER_DEFINED.ACPITABLE]\r
   FILE FREEFORM = $(NAMED_GUID) {\r
     RAW ACPI               |.acpi\r
@@ -384,8 +401,3 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
   FILE RAW = $(NAMED_GUID) {\r
     RAW RAW                |.raw\r
   }\r
-\r
-[OptionRom.OvmfVideo]\r
-INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {\r
-    PCI_DEVICE_ID  = 0x00B8\r
-  }\r