## @file\r
# Open Virtual Machine Firmware: FDF\r
#\r
-# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2016, 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
################################################################################\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
-\r
!include OvmfPkg.fdf.inc\r
\r
#\r
\r
[FD.MEMFD]\r
BaseAddress = $(MEMFD_BASE_ADDRESS)\r
-Size = 0xA00000\r
+Size = 0xB00000\r
ErasePolarity = 1\r
BlockSize = 0x10000\r
-NumBlocks = 0xA0\r
+NumBlocks = 0xB0\r
\r
0x000000|0x006000\r
gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize\r
0x010000|0x008000\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|0x900000\r
+0x100000|0xA00000\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 OvmfPkg/SmmAccess/SmmAccessPei.inf\r
!endif\r
+INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf\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
\r
#\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/CpuIo2Dxe/CpuIo2Dxe.inf\r
INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
-INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.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
-INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
!endif\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 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/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 FatBinPkg/EnhancedFatDxe/Fat.inf\r
+INF FatPkg/EnhancedFatDxe/Fat.inf\r
\r
!ifndef $(USE_OLD_SHELL)\r
INF ShellPkg/Application/Shell/Shell.inf\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/EFIX64/E3507X2.EFI\r
+ SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI\r
}\r
!endif\r
INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.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 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/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 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
################################################################################\r
\r
[FV.FVMAIN_COMPACT]\r
+FvNameGuid = 48DB5E17-707C-472D-91CD-1613E7EF51B0\r
FvAlignment = 16\r
ERASE_POLARITY = 1\r
MEMORY_MAPPED = TRUE\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
FILE RAW = $(NAMED_GUID) {\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