]> git.proxmox.com Git - mirror_edk2.git/blobdiff - OvmfPkg/OvmfPkgIa32.fdf
OvmfPkg: Drop build flag USE_LEGACY_ISA_STACK and legacy ISA stack
[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32.fdf
index c6e186f26d772af17ca629395453949e6408b4f7..12da9f4706bdfab45da5acf27be76517ec672f0a 100644 (file)
 ## @file\r
 #  Open Virtual Machine Firmware: FDF\r
 #\r
-#  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+#  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 #\r
-#  This program and the accompanying materials\r
-#  are licensed and made available under the terms and conditions of the BSD License\r
-#  which accompanies this distribution. The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
 \r
 ################################################################################\r
 \r
-#\r
-# Default flash size for DEBUG build is 2MB. For RELEASE it is 1MB.\r
-#\r
-# Defining FD_SIZE_1MB or FD_SIZE_2MB on the build command line can\r
-# override this.\r
-#\r
 [Defines]\r
-!if $(TARGET) == RELEASE\r
-!ifndef $(FD_SIZE_2MB)\r
-DEFINE FD_SIZE_1MB=\r
-!endif\r
-!endif\r
+!include OvmfPkg.fdf.inc\r
 \r
-!ifdef $(FD_SIZE_1MB)\r
-[FD.OVMF]\r
-BaseAddress   = 0xFFF00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress\r
-Size          = 0x00100000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize\r
-ErasePolarity = 1\r
-BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize\r
-NumBlocks     = 0x100\r
-!else\r
+#\r
+# Build the variable store and the firmware code as one unified flash device\r
+# image.\r
+#\r
 [FD.OVMF]\r
-BaseAddress   = 0xFFE00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress\r
-Size          = 0x00200000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize\r
+BaseAddress   = $(FW_BASE_ADDRESS)\r
+Size          = $(FW_SIZE)\r
 ErasePolarity = 1\r
-BlockSize     = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize\r
-NumBlocks     = 0x200\r
-!endif\r
-\r
-0x00000000|0x0000e000\r
-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize\r
-#NV_VARIABLE_STORE\r
-DATA = {\r
-  ## This is the EFI_FIRMWARE_VOLUME_HEADER\r
-  # ZeroVector []\r
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-  # FileSystemGuid: gEfiSystemNvDataFvGuid         =\r
-  #   { 0xFFF12B8D, 0x7696, 0x4C8B,\r
-  #     { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }}\r
-  0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C,\r
-  0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50,\r
-  # FvLength: 0x20000\r
-  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-  # Signature "_FVH"       # Attributes\r
-  0x5f, 0x46, 0x56, 0x48, 0xff, 0xfe, 0x04, 0x00,\r
-  # HeaderLength # CheckSum # ExtHeaderOffset #Reserved #Revision\r
-  0x48, 0x00, 0x19, 0xF9, 0x00, 0x00, 0x00, 0x02,\r
-  # Blockmap[0]: 0x20 Blocks * 0x1000 Bytes / Block\r
-  0x20, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00,\r
-  # Blockmap[1]: End\r
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\r
-  ## This is the VARIABLE_STORE_HEADER\r
-!if $(SECURE_BOOT_ENABLE) == TRUE\r
-  # Signature: gEfiAuthenticatedVariableGuid =\r
-  #   { 0xaaf32c78, 0x947b, 0x439a,\r
-  #     { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 }}\r
-  0x78, 0x2c, 0xf3, 0xaa, 0x7b, 0x94, 0x9a, 0x43,\r
-  0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92,\r
-!else\r
-  # Signature: gEfiVariableGuid =\r
-  #   { 0xddcf3616, 0x3275, 0x4164,\r
-  #     { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}\r
-  0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41,\r
-  0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d,\r
-!endif\r
-  # Size: 0xe000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize) -\r
-  #         0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) = 0xdfb8\r
-  # This can speed up the Variable Dispatch a bit.\r
-  0xB8, 0xDF, 0x00, 0x00,\r
-  # FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32\r
-  0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
-}\r
+BlockSize     = $(BLOCK_SIZE)\r
+NumBlocks     = $(FW_BLOCKS)\r
 \r
-0x0000e000|0x00001000\r
-#NV_EVENT_LOG\r
-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageEventLogSize\r
-\r
-0x0000f000|0x00001000\r
-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize\r
-#NV_FTW_WORKING\r
-DATA = {\r
-  # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature = gEdkiiWorkingBlockSignatureGuid         =\r
-  #  { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95 }}\r
-  0x2b, 0x29, 0x58, 0x9e, 0x68, 0x7c, 0x7d, 0x49,\r
-  0xa0, 0xce, 0x65,  0x0, 0xfd, 0x9f, 0x1b, 0x95,\r
-  # Crc:UINT32            #WorkingBlockValid:1, WorkingBlockInvalid:1, Reserved\r
-  0x2c, 0xaf, 0x2c, 0x64, 0xFE, 0xFF, 0xFF, 0xFF,\r
-  # WriteQueueSize: UINT64\r
-  0xE0, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\r
-}\r
+!include VarStore.fdf.inc\r
 \r
-0x00010000|0x00010000\r
-#NV_FTW_SPARE\r
-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize\r
-\r
-!ifdef $(FD_SIZE_1MB)\r
-0x00020000|0x000CC000\r
+$(VARS_SIZE)|$(FVMAIN_SIZE)\r
 FV = FVMAIN_COMPACT\r
 \r
-0x000EC000|0x14000\r
+$(SECFV_OFFSET)|$(SECFV_SIZE)\r
 FV = SECFV\r
 \r
-!else\r
-0x00020000|0x001AC000\r
+#\r
+# Build the variable store and the firmware code as separate flash device\r
+# images.\r
+#\r
+[FD.OVMF_VARS]\r
+BaseAddress   = $(FW_BASE_ADDRESS)\r
+Size          = $(VARS_SIZE)\r
+ErasePolarity = 1\r
+BlockSize     = $(BLOCK_SIZE)\r
+NumBlocks     = $(VARS_BLOCKS)\r
+\r
+!include VarStore.fdf.inc\r
+\r
+[FD.OVMF_CODE]\r
+BaseAddress   = $(CODE_BASE_ADDRESS)\r
+Size          = $(CODE_SIZE)\r
+ErasePolarity = 1\r
+BlockSize     = $(BLOCK_SIZE)\r
+NumBlocks     = $(CODE_BLOCKS)\r
+\r
+0x00000000|$(FVMAIN_SIZE)\r
 FV = FVMAIN_COMPACT\r
 \r
-0x001CC000|0x34000\r
+$(FVMAIN_SIZE)|$(SECFV_SIZE)\r
 FV = SECFV\r
-!endif\r
 \r
 ################################################################################\r
 \r
 [FD.MEMFD]\r
-BaseAddress   = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase\r
-Size          = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
+BaseAddress   = $(MEMFD_BASE_ADDRESS)\r
+Size          = 0xC00000\r
 ErasePolarity = 1\r
 BlockSize     = 0x10000\r
-NumBlocks     = 0x80\r
+NumBlocks     = 0xC0\r
+\r
+0x000000|0x006000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize\r
+\r
+0x006000|0x001000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize\r
 \r
-0x0|0x800000\r
-FV = MAINFV\r
+0x007000|0x001000\r
+gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize\r
+\r
+0x010000|0x010000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize\r
+\r
+0x020000|0x0E0000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize\r
+FV = PEIFV\r
+\r
+0x100000|0xB00000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize\r
+FV = DXEFV\r
 \r
 ################################################################################\r
 \r
 [FV.SECFV]\r
+FvNameGuid         = 763BED0D-DE9F-48F5-81F1-3E90E1B1A015\r
 BlockSize          = 0x1000\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -163,14 +113,15 @@ READ_LOCK_STATUS   = TRUE
 # 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 UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf\r
+INF  RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf\r
 \r
 ################################################################################\r
-[FV.MAINFV]\r
+[FV.PEIFV]\r
+FvNameGuid         = 6938079B-B503-4E3D-9D24-B28337A25806\r
 BlockSize          = 0x10000\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -189,15 +140,6 @@ READ_STATUS        = TRUE
 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
@@ -207,19 +149,26 @@ APRIORI PEI {
 #\r
 INF  MdeModulePkg/Core/Pei/PeiMain.inf\r
 INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
+INF  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf\r
+INF  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf\r
 INF  OvmfPkg/PlatformPei/PlatformPei.inf\r
 INF  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
+INF  UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf\r
+!if $(SMM_REQUIRE) == TRUE\r
+INF  OvmfPkg/SmmAccess/SmmAccessPei.inf\r
+!endif\r
+INF  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 \r
-FILE FV_IMAGE = A4EF5A93-3F1B-4232-A1C4-F0910E6D1D9C {\r
-  SECTION COMPRESS PI_NONE {\r
-    SECTION FV_IMAGE = DXEFV\r
-  }\r
-}\r
+!if $(TPM2_ENABLE) == TRUE\r
+INF  OvmfPkg/Tcg/Tcg2Config/Tcg2ConfigPei.inf\r
+INF  SecurityPkg/Tcg/Tcg2Pei/Tcg2Pei.inf\r
+!endif\r
 \r
 ################################################################################\r
 \r
 [FV.DXEFV]\r
+FvForceRebase      = FALSE\r
+FvNameGuid         = 7CB8BDC9-F8EB-4F34-AAEA-3EE4AF6516A1\r
 BlockSize          = 0x10000\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -241,7 +190,9 @@ READ_LOCK_STATUS   = TRUE
 APRIORI DXE {\r
   INF  MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+!if $(SMM_REQUIRE) == FALSE\r
   INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
+!endif\r
 }\r
 \r
 #\r
@@ -249,35 +200,36 @@ APRIORI DXE {
 #\r
 INF  MdeModulePkg/Core/Dxe/DxeMain.inf\r
 \r
-INF  IntelFrameworkModulePkg/Universal/StatusCode/RuntimeDxe/StatusCodeRuntimeDxe.inf\r
+INF  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf\r
+INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
 \r
 INF  MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
 INF  MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
-INF  PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
+INF  OvmfPkg/8259InterruptControllerDxe/8259.inf\r
 INF  UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
 INF  UefiCpuPkg/CpuDxe/CpuDxe.inf\r
-INF  PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
-INF  PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
+INF  OvmfPkg/8254TimerDxe/8254Timer.inf\r
+INF  OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.inf\r
+INF  OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.inf\r
+INF  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
 INF  MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
-INF  PcAtChipsetPkg/KbcResetDxe/Reset.inf\r
+INF  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf\r
 INF  MdeModulePkg/Universal/Metronome/Metronome.inf\r
 INF  PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
 \r
-INF  OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf\r
 INF  OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
+INF  OvmfPkg/Virtio10Dxe/Virtio10.inf\r
 INF  OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
 INF  OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
-INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
-INF  OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf\r
-INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
+INF  OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
+INF  OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf\r
+INF  OvmfPkg/XenBusDxe/XenBusDxe.inf\r
+INF  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
 \r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
-  INF  SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf\r
-  INF  OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
-!else\r
-  INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+  INF  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
 !endif\r
 \r
 INF  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
@@ -287,30 +239,31 @@ INF  MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
 INF  MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
 INF  MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
 INF  MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
-INF  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+INF  MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
+INF  MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+INF  MdeModulePkg/Application/UiApp/UiApp.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/Disk/PartitionDxe/PartitionDxe.inf\r
+INF  MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
 INF  MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
 INF  MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
-INF  IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/IdeBusDxe.inf\r
-INF  PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf\r
+INF  OvmfPkg/SataControllerDxe/SataControllerDxe.inf\r
+INF  MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf\r
+INF  MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf\r
 INF  MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
 INF  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.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
-\r
+INF  OvmfPkg/SioBusDxe/SioBusDxe.inf\r
 !ifndef $(SOURCE_DEBUG_ENABLE)\r
-INF  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf\r
 !endif\r
-\r
-INF  IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
-INF  IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf\r
+INF  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf\r
 \r
 INF  MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
 INF  OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
@@ -318,40 +271,24 @@ INF  OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
 INF  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
 INF  OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
 INF  RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
+INF  MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf\r
+INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf\r
+INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
 \r
-INF  RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF  FatPkg/EnhancedFatDxe/Fat.inf\r
+INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
 \r
-!ifndef $(USE_OLD_SHELL)\r
-INF  ShellPkg/Application/Shell/Shell.inf\r
-!else\r
-INF  RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
+!if $(TOOL_CHAIN_TAG) != "XCODE5"\r
+INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
 !endif\r
+INF  ShellPkg/Application/Shell/Shell.inf\r
 \r
-FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
-  SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
-}\r
+INF MdeModulePkg/Logo/LogoDxe.inf\r
 \r
 #\r
 # Network modules\r
 #\r
-!if $(E1000_ENABLE)\r
-  FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {\r
-    SECTION PE32 = Intel3.5/EFI32/E3507E2.EFI\r
-  }\r
-!endif\r
-  INF  MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-  INF  MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-  INF  MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
+!include NetworkPkg/Network.fdf.inc\r
   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r
 #\r
@@ -359,6 +296,7 @@ FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {
 #\r
 INF  MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
 INF  MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf\r
+INF  MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
 INF  MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
 INF  MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
 INF  MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
@@ -370,10 +308,51 @@ INF  RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
 !endif\r
 \r
 INF  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
+INF  OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf\r
+INF  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
+INF  OvmfPkg/PlatformDxe/Platform.inf\r
+INF  OvmfPkg/IoMmuDxe/IoMmuDxe.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  MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf\r
+INF  MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf\r
+INF  UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf\r
+INF  MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf\r
+INF  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf\r
+\r
+#\r
+# Variable driver stack (SMM)\r
+#\r
+INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesSmm.inf\r
+INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf\r
+INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf\r
+INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf\r
+\r
+!else\r
+\r
+#\r
+# Variable driver stack (non-SMM)\r
+#\r
+INF  OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
+INF  OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf\r
+INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
+INF  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+!endif\r
+\r
+!if $(TPM2_ENABLE) == TRUE\r
+INF  SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf\r
+!if $(TPM2_CONFIG_ENABLE) == TRUE\r
+INF  SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf\r
+!endif\r
+!endif\r
 \r
 ################################################################################\r
 \r
 [FV.FVMAIN_COMPACT]\r
+FvNameGuid         = 48DB5E17-707C-472D-91CD-1613E7EF51B0\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
 MEMORY_MAPPED      = TRUE\r
@@ -393,10 +372,18 @@ READ_LOCK_STATUS   = TRUE
 \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
+!include DecomprScratchEnd.fdf.inc\r
+\r
 ################################################################################\r
 \r
 [Rule.Common.SEC]\r
@@ -408,7 +395,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
 \r
 [Rule.Common.PEI_CORE]\r
   FILE PEI_CORE = $(NAMED_GUID) {\r
-    PE32     PE32   Align=32    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+    PE32     PE32   Align=Auto    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING ="$(MODULE_NAME)" Optional\r
     VERSION  STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
@@ -416,7 +403,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
 [Rule.Common.PEIM]\r
   FILE PEIM = $(NAMED_GUID) {\r
      PEI_DEPEX PEI_DEPEX Optional        $(INF_OUTPUT)/$(MODULE_NAME).depex\r
-     PE32      PE32   Align=32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+     PE32      PE32   Align=Auto         $(INF_OUTPUT)/$(MODULE_NAME).efi\r
      UI       STRING="$(MODULE_NAME)" Optional\r
      VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r
@@ -434,6 +421,8 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
     PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
     UI       STRING="$(MODULE_NAME)" Optional\r
     VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+    RAW ACPI  Optional               |.acpi\r
+    RAW ASL   Optional               |.aml\r
   }\r
 \r
 [Rule.Common.DXE_RUNTIME_DRIVER]\r
@@ -487,5 +476,20 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
 \r
 [Rule.Common.SEC.RESET_VECTOR]\r
   FILE RAW = $(NAMED_GUID) {\r
-    RAW RAW                |.raw\r
+    RAW BIN   Align = 16   |.bin\r
+  }\r
+\r
+[Rule.Common.SMM_CORE]\r
+  FILE SMM_CORE = $(NAMED_GUID) {\r
+    PE32     PE32           $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+    UI       STRING="$(MODULE_NAME)" Optional\r
+    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
+  }\r
+\r
+[Rule.Common.DXE_SMM_DRIVER]\r
+  FILE SMM = $(NAMED_GUID) {\r
+    SMM_DEPEX    SMM_DEPEX Optional      $(INF_OUTPUT)/$(MODULE_NAME).depex\r
+    PE32     PE32                    $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+    UI       STRING="$(MODULE_NAME)" Optional\r
+    VERSION  STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
   }\r