## @file\r
# Open Virtual Machine Firmware: FDF\r
#\r
-# Copyright (c) 2006 - 2015, 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
[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
\r
[FD.MEMFD]\r
BaseAddress = $(MEMFD_BASE_ADDRESS)\r
-Size = 0xA00000\r
+Size = 0xD00000\r
ErasePolarity = 1\r
BlockSize = 0x10000\r
-NumBlocks = 0xA0\r
+NumBlocks = 0xD0\r
\r
0x000000|0x006000\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize\r
0x007000|0x001000\r
gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize\r
\r
-0x010000|0x008000\r
-gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize\r
+0x008000|0x001000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaSize\r
\r
-0x018000|0x008000\r
-gUefiOvmfPkgTokenSpaceGuid.PcdS3AcpiReservedMemoryBase|gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdS3AcpiReservedMemorySize\r
+0x010000|0x010000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize\r
\r
0x020000|0x0E0000\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvSize\r
FV = PEIFV\r
\r
-0x100000|0x900000\r
+0x100000|0xC00000\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
\r
################################################################################\r
[FV.PEIFV]\r
+FvNameGuid = 6938079B-B503-4E3D-9D24-B28337A25806\r
BlockSize = 0x10000\r
FvAlignment = 16\r
ERASE_POLARITY = 1\r
#\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 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
+\r
+!include OvmfPkg/OvmfTpmPei.fdf.inc\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
APRIORI DXE {\r
INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+ INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf\r
!if $(SMM_REQUIRE) == FALSE\r
INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
!endif\r
#\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 UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
-INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
-INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
+!ifdef $(CSM_ENABLE)\r
+ INF OvmfPkg/8259InterruptControllerDxe/8259.inf\r
+ INF OvmfPkg/8254TimerDxe/8254Timer.inf\r
+!else\r
+ INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf\r
+!endif\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/XenIoPciDxe/XenIoPciDxe.inf\r
-INF OvmfPkg/XenBusDxe/XenBusDxe.inf\r
-INF OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
+INF OvmfPkg/VirtioRngDxe/VirtioRng.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
+!if $(LSI_SCSI_ENABLE) == TRUE\r
+INF OvmfPkg/LsiScsiDxe/LsiScsiDxe.inf\r
+!endif\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
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 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
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 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
-!ifndef $(SOURCE_DEBUG_ENABLE)\r
-INF IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf\r
+INF OvmfPkg/SioBusDxe/SioBusDxe.inf\r
+!if $(SOURCE_DEBUG_ENABLE) == FALSE\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
\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
+INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
\r
-INF RuleOverride = BINARY USE = X64 FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF FatPkg/EnhancedFatDxe/Fat.inf\r
+INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
+INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf\r
\r
-!ifndef $(USE_OLD_SHELL)\r
-INF ShellPkg/Application/Shell/Shell.inf\r
-!else\r
-INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf\r
+!if $(TOOL_CHAIN_TAG) != "XCODE5"\r
+INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
+INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf\r
+INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.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/EFIX64/E3507X2.EFI\r
+ SECTION PE32 = Intel3.5/EFIX64/E3522X2.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/Ip4Dxe/Ip4Dxe.inf\r
- INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
- INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
-!if $(NETWORK_IP6_ENABLE) == TRUE\r
- INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf\r
- INF NetworkPkg/TcpDxe/TcpDxe.inf\r
- INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf\r
- INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf\r
- INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf\r
- INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
-!if $(SECURE_BOOT_ENABLE) == TRUE\r
- INF NetworkPkg/IScsiDxe/IScsiDxe.inf\r
-!else\r
- INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-!endif\r
-!else\r
- INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf\r
- INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
- INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-!endif\r
-!if $(HTTP_BOOT_ENABLE) == TRUE\r
- INF NetworkPkg/DnsDxe/DnsDxe.inf\r
- INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf\r
- INF NetworkPkg/HttpDxe/HttpDxe.inf\r
- INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf\r
-!endif\r
+!include NetworkPkg/Network.fdf.inc\r
INF OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
\r
#\r
INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
\r
!ifdef $(CSM_ENABLE)\r
-INF IntelFrameworkModulePkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf\r
-INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf\r
+INF OvmfPkg/Csm/BiosThunk/VideoDxe/VideoDxe.inf\r
+INF OvmfPkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf\r
INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf\r
+!else\r
+INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
!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/AmdSevDxe/AmdSevDxe.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 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
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
!endif\r
\r
+#\r
+# TPM support\r
+#\r
+!include OvmfPkg/OvmfTpmDxe.fdf.inc\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
}\r
}\r
\r
-!include DecomprScratchEnd.fdf.inc\r
+!include FvmainCompactScratchEnd.fdf.inc\r
\r
################################################################################\r
\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
+ RAW ACPI Optional |.acpi\r
+ RAW ASL Optional |.aml\r
}\r
\r
[Rule.Common.DXE_RUNTIME_DRIVER]\r
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
}\r
\r
-[Rule.Common.USER_DEFINED.ACPITABLE]\r
- FILE FREEFORM = $(NAMED_GUID) {\r
- RAW ACPI |.acpi\r
- RAW ASL |.aml\r
- }\r
-\r
[Rule.Common.USER_DEFINED.CSM]\r
FILE FREEFORM = $(NAMED_GUID) {\r
RAW BIN |.bin\r