X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=OvmfPkg%2FOvmfPkgX64.fdf;h=fcdac0316bed04790ceb5858024da6dbe4afa9f4;hb=37078a63b1911f8b320bab6d82a2183a84f8858c;hp=52bdefd84f778270e55eefdddee0e6fbba6f6219;hpb=4b3d663f7b2f0db316f20c0ee86c7270c1338852;p=mirror_edk2.git
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
index 52bdefd84f..fcdac0316b 100644
--- a/OvmfPkg/OvmfPkgX64.fdf
+++ b/OvmfPkg/OvmfPkgX64.fdf
@@ -1,7 +1,7 @@
## @file
# Open Virtual Machine Firmware: FDF
#
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -14,6 +14,7 @@
##
################################################################################
+!ifndef $(FD_SIZE_2MB)
[FD.OVMF]
BaseAddress = 0xFFF00000
Size = 0x00100000
@@ -21,22 +22,36 @@ ErasePolarity = 1
BlockSize = 0x1000
NumBlocks = 0x100
-0x00000000|0x000EC000
+0x00000000|0x000E6000
FV = FVMAIN_COMPACT
-0x000EC000|0x14000
+0x000E6000|0x1A000
FV = SECFV
+!else
+[FD.OVMF]
+BaseAddress = 0xFFE00000
+Size = 0x00200000
+ErasePolarity = 1
+BlockSize = 0x1000
+NumBlocks = 0x200
+
+0x00000000|0x001CC000
+FV = FVMAIN_COMPACT
+
+0x001CC000|0x34000
+FV = SECFV
+!endif
################################################################################
[FD.MEMFD]
BaseAddress = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase
-Size = 0x500000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize
+Size = 0x600000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize
ErasePolarity = 1
BlockSize = 0x10000
-NumBlocks = 0x50
+NumBlocks = 0x60
-0x0|0x500000
+0x0|0x600000
FV = MAINFV
################################################################################
@@ -113,7 +128,9 @@ INF OvmfPkg/PlatformPei/PlatformPei.inf
INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
FILE FV_IMAGE = A4EF5A93-3F1B-4232-A1C4-F0910E6D1D9C {
- SECTION FV_IMAGE = DXEFV
+ SECTION COMPRESS PI_NONE {
+ SECTION FV_IMAGE = DXEFV
+ }
}
################################################################################
@@ -163,9 +180,18 @@ INF MdeModulePkg/Universal/Metronome/Metronome.inf
INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf
INF OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf
+INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf
+INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf
INF OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf
-INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+
+!if $(SECURE_BOOT_ENABLE) == TRUE
+ INF SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf
+ INF OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf
+!else
+ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+!endif
+
INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf
INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
@@ -201,7 +227,7 @@ INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
-INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf
+INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
INF RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf
INF RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf
@@ -257,6 +283,8 @@ INF IntelFrameworkModulePkg/Csm/LegacyBiosDxe/LegacyBiosDxe.inf
INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf
!endif
+INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
+
################################################################################
[FV.FVMAIN_COMPACT]
@@ -345,7 +373,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
-
+
[Rule.Common.UEFI_APPLICATION]
FILE APPLICATION = $(NAMED_GUID) {
PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi
@@ -359,7 +387,7 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
UI STRING="$(MODULE_NAME)" Optional
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)
}
-
+
[Rule.Common.USER_DEFINED.ACPITABLE]
FILE FREEFORM = $(NAMED_GUID) {
RAW ACPI |.acpi
@@ -375,8 +403,3 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
FILE RAW = $(NAMED_GUID) {
RAW RAW |.raw
}
-
-[OptionRom.OvmfVideo]
-INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {
- PCI_DEVICE_ID = 0x00B8
- }