## @file\r
# Open Virtual Machine Firmware: FDF\r
#\r
-# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2017, 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
\r
[FD.MEMFD]\r
BaseAddress = $(MEMFD_BASE_ADDRESS)\r
-Size = 0xB00000\r
+Size = 0xC00000\r
ErasePolarity = 1\r
BlockSize = 0x10000\r
-NumBlocks = 0xB0\r
+NumBlocks = 0xC0\r
\r
0x000000|0x006000\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize\r
0x007000|0x001000\r
gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize\r
\r
-0x010000|0x008000\r
+0x010000|0x010000\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|0xA00000\r
+0x100000|0xB00000\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize\r
FV = DXEFV\r
\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 OvmfPkg/SmmAccess/SmmAccessPei.inf\r
!endif\r
+INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf\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
#\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 UefiCpuPkg/CpuDxe/CpuDxe.inf\r
INF PcAtChipsetPkg/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 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 FatPkg/EnhancedFatDxe/Fat.inf\r
+INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf\r
\r
!ifndef $(USE_OLD_SHELL)\r
+INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf\r
INF ShellPkg/Application/Shell/Shell.inf\r
!else\r
INF RuleOverride = BINARY EdkShellBinPkg/FullShell/FullShell.inf\r
!endif\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/Ip4Dxe/Ip4Dxe.inf\r
INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf\r
+ INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
+ INF NetworkPkg/TcpDxe/TcpDxe.inf\r
+ INF NetworkPkg/IScsiDxe/IScsiDxe.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
+!if $(TLS_ENABLE) == TRUE\r
+ INF NetworkPkg/TlsDxe/TlsDxe.inf\r
+ INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf\r
!endif\r
INF OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
\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/IoMmuDxe/IoMmuDxe.inf\r
\r
!if $(SMM_REQUIRE) == TRUE\r
INF OvmfPkg/SmmAccess/SmmAccess2Dxe.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
+!endif\r
+\r
################################################################################\r
\r
[FV.FVMAIN_COMPACT]\r