## @file\r
# Open Virtual Machine Firmware: FDF\r
#\r
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<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
BlockSize = 0x1000\r
NumBlocks = 0x100\r
\r
-0x00000000|0x000EC000\r
+0x00000000|0x000E6000\r
FV = FVMAIN_COMPACT\r
\r
-0x000EC000|0x14000\r
+0x000E6000|0x1A000\r
FV = SECFV\r
\r
################################################################################\r
\r
[FD.MEMFD]\r
BaseAddress = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase\r
-Size = 0x500000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
+Size = 0x600000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
ErasePolarity = 1\r
BlockSize = 0x10000\r
-NumBlocks = 0x50\r
+NumBlocks = 0x60\r
\r
-0x0|0x500000\r
+0x0|0x600000\r
FV = MAINFV\r
\r
################################################################################\r
INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
\r
FILE FV_IMAGE = A4EF5A93-3F1B-4232-A1C4-F0910E6D1D9C {\r
- SECTION FV_IMAGE = DXEFV\r
+ SECTION COMPRESS PI_NONE {\r
+ SECTION FV_IMAGE = DXEFV\r
+ }\r
}\r
\r
################################################################################\r
INF OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf\r
INF OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf\r
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
-INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+ INF SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf\r
+ INF OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+!else\r
+ INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+!endif\r
+\r
INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf\r
INF MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf\r
INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
\r
INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
-INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
+INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf\r
INF RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
\r
INF RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\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 RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf\r
+!endif\r
+\r
+INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
+\r
################################################################################\r
\r
[FV.FVMAIN_COMPACT]\r
UI STRING="$(MODULE_NAME)" Optional\r
VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
}\r
- \r
+\r
[Rule.Common.UEFI_APPLICATION]\r
FILE APPLICATION = $(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
+\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
+ }\r
+\r
[Rule.Common.SEC.RESET_VECTOR]\r
FILE RAW = $(NAMED_GUID) {\r
RAW RAW |.raw\r
}\r
-\r
-[OptionRom.OvmfVideo]\r
-INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {\r
- PCI_DEVICE_ID = 0x00B8\r
- }\r