Patch from open source community for CryptoPkg to allow it to build for ARM using...

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.fdf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 9f03b124996db427b9fa947fa36c7ea1e7afd69a..7ae95cd3456436766f256647c7079c4e866f1542 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -21,22 +21,22 @@ ErasePolarity = 1
 BlockSize     = 0x1000\r
 NumBlocks     = 0x100\r
 \r
-0x00000000|0x000EE000\r
+0x00000000|0x000EC000\r
 FV = FVMAIN_COMPACT\r
 \r
-0x000EE000|0x12000\r
+0x000EC000|0x14000\r
 FV = SECFV\r
 \r
 ################################################################################\r
 \r
 [FD.MEMFD]\r
 BaseAddress   = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase\r
-Size          = 0x400000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
+Size          = 0x500000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
-NumBlocks     = 0x40\r
+NumBlocks     = 0x50\r
 \r
-0x0|0x400000\r
+0x0|0x500000\r
 FV = MAINFV\r
 \r
 ################################################################################\r
@@ -190,6 +190,7 @@ INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf
 INF  PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf\r
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
+INF  MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
 \r
 INF  PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.inf\r
 INF  IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaBusDxe.inf\r
@@ -200,7 +201,6 @@ INF  IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf
 INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
 INF  MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
 INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
-INF  OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf\r
 \r
 INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
 INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
@@ -213,7 +213,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 # Network modules\r
 #\r
 !if $(NETWORK_ENABLE)\r
-  FILE DRIVER = A5C9C8B3-5ABB-4be2-8CA6-2FF06F405D04 {\r
+  FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {\r
     SECTION PE32 = Intel3.5/EFIX64/E3507X2.EFI\r
   }\r
   INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
@@ -354,7 +354,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     RAW RAW                |.raw\r
   }\r
 \r
-[OptionRom.CirrusLogic5446]\r
-INF  OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf {\r
+[OptionRom.OvmfVideo]\r
+INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {\r
     PCI_DEVICE_ID  = 0x00B8\r
   }\r