]> git.proxmox.com Git - mirror_edk2.git/blobdiff - OvmfPkg/OvmfPkgIa32.fdf
projects / mirror_edk2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
OvmfPkg: Drop build flag USE_LEGACY_ISA_STACK and legacy ISA stack
[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32.fdf
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 5e5ade2a1fcbdbae7f0ea6ae3f189d2409163d42..12da9f4706bdfab45da5acf27be76517ec672f0a 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -1,16 +1,10 @@
 ## @file\r
 #  Open Virtual Machine Firmware: FDF\r
 #\r
-#  Copyright (c) 2006 - 2016, 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
@@ -68,10 +62,10 @@ FV = SECFV
 \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
@@ -82,14 +76,14 @@ gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase|gUefiOvmfPkgTokenSpaceGuid.
 0x007000|0x001000\r
 gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize\r
 \r
-0x010000|0x008000\r
+0x010000|0x010000\r
 gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPeiTempRamSize\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
@@ -165,6 +159,11 @@ INF  OvmfPkg/SmmAccess/SmmAccessPei.inf
 !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
@@ -208,10 +207,10 @@ INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 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  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
@@ -220,7 +219,6 @@ INF  MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf
 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
@@ -261,15 +259,11 @@ INF  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
 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
@@ -282,50 +276,19 @@ INF  MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
 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/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
 INF MdeModulePkg/Logo/LogoDxe.inf\r
 \r
 #\r
 # Network modules\r
 #\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
-  INF  NetworkPkg/IScsiDxe/IScsiDxe.inf\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
+!include NetworkPkg/Network.fdf.inc\r
   INF  OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r
 #\r
@@ -345,6 +308,7 @@ 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
@@ -378,6 +342,13 @@ INF  MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
 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
EFI Development Kit II mirror for PVE