## @file\r
# Open Virtual Machine Firmware: FDF\r
#\r
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2014, 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
##\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
+# Build the variable store and the firmware code as one unified flash device\r
+# image.\r
+#\r
[FD.OVMF]\r
-BaseAddress = 0xFFF00000\r
-Size = 0x00100000\r
+BaseAddress = $(FW_BASE_ADDRESS)\r
+Size = $(FW_SIZE)\r
+ErasePolarity = 1\r
+BlockSize = $(BLOCK_SIZE)\r
+NumBlocks = $(FW_BLOCKS)\r
+\r
+!include VarStore.fdf.inc\r
+\r
+$(VARS_SIZE)|$(FVMAIN_SIZE)\r
+FV = FVMAIN_COMPACT\r
+\r
+$(SECFV_OFFSET)|$(SECFV_SIZE)\r
+FV = SECFV\r
+\r
+#\r
+# Build the variable store and the firmware code as separate flash device\r
+# images.\r
+#\r
+[FD.OVMF_VARS]\r
+BaseAddress = $(FW_BASE_ADDRESS)\r
+Size = $(VARS_SIZE)\r
+ErasePolarity = 1\r
+BlockSize = $(BLOCK_SIZE)\r
+NumBlocks = $(VARS_BLOCKS)\r
+\r
+!include VarStore.fdf.inc\r
+\r
+[FD.OVMF_CODE]\r
+BaseAddress = $(CODE_BASE_ADDRESS)\r
+Size = $(CODE_SIZE)\r
ErasePolarity = 1\r
-BlockSize = 0x1000\r
-NumBlocks = 0x100\r
+BlockSize = $(BLOCK_SIZE)\r
+NumBlocks = $(CODE_BLOCKS)\r
\r
-0x00000000|0x000EC000\r
+0x00000000|$(FVMAIN_SIZE)\r
FV = FVMAIN_COMPACT\r
\r
-0x000EC000|0x14000\r
+$(FVMAIN_SIZE)|$(SECFV_SIZE)\r
FV = SECFV\r
\r
################################################################################\r
\r
[FD.MEMFD]\r
-BaseAddress = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase\r
-Size = 0x500000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
+BaseAddress = 0x800000\r
+Size = 0x900000\r
ErasePolarity = 1\r
BlockSize = 0x10000\r
-NumBlocks = 0x50\r
+NumBlocks = 0x90\r
+\r
+0x000000|0x006000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecPageTablesSize\r
+\r
+0x006000|0x001000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfLockBoxStorageSize\r
\r
-0x0|0x500000\r
-FV = MAINFV\r
+0x007000|0x001000\r
+gEfiMdePkgTokenSpaceGuid.PcdGuidedExtractHandlerTableAddress|gUefiOvmfPkgTokenSpaceGuid.PcdGuidedExtractHandlerTableSize\r
+\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|0x800000\r
+gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvBase|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfDxeMemFvSize\r
+FV = DXEFV\r
\r
################################################################################\r
\r
# SEC Phase modules\r
#\r
# The code in this FV handles the initial firmware startup, and\r
-# decompresses the MAINFV which handles the majority of the boot sequence.\r
+# decompresses the PEI and DXE FVs which handles the rest of the boot sequence.\r
#\r
INF OvmfPkg/Sec/SecMain.inf\r
\r
-INF RuleOverride=RESET_VECTOR USE = IA32 UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf\r
+INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf\r
\r
################################################################################\r
-[FV.MAINFV]\r
+[FV.PEIFV]\r
BlockSize = 0x10000\r
FvAlignment = 16\r
ERASE_POLARITY = 1\r
READ_LOCK_CAP = TRUE\r
READ_LOCK_STATUS = TRUE\r
\r
-#\r
-# Files to be placed in MAIN FV\r
-#\r
-# This firmware volume will have files placed in it uncompressed,\r
-# and then then entire firmware volume will be compressed in a\r
-# single compression operation in order to achieve better\r
-# overall compression.\r
-#\r
-\r
APRIORI PEI {\r
INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
}\r
INF IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
INF OvmfPkg/PlatformPei/PlatformPei.inf\r
INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
-\r
-FILE FV_IMAGE = A4EF5A93-3F1B-4232-A1C4-F0910E6D1D9C {\r
- SECTION FV_IMAGE = DXEFV\r
-}\r
+INF UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf\r
\r
################################################################################\r
\r
READ_LOCK_STATUS = TRUE\r
\r
APRIORI DXE {\r
+ INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
+ INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
}\r
\r
#\r
INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
\r
INF OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf\r
+INF OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.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 MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+INF OvmfPkg/XenBusDxe/XenBusDxe.inf\r
+INF OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
+\r
+!if $(SECURE_BOOT_ENABLE) == TRUE\r
+ INF SecurityPkg/VariableAuthenticated/RuntimeDxe/VariableRuntimeDxe.inf\r
+ INF SecurityPkg/VariableAuthenticated/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 PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.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/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
\r
INF PcAtChipsetPkg/IsaAcpiDxe/IsaAcpi.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
+INF OvmfPkg/AcpiS3SaveDxe/AcpiS3SaveDxe.inf\r
+INF MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf\r
+INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf\r
\r
INF RuleOverride = BINARY USE = X64 FatBinPkg/EnhancedFatDxe/Fat.inf\r
\r
-!if $(BUILD_NEW_SHELL)\r
+!ifndef $(USE_OLD_SHELL)\r
INF ShellPkg/Application/Shell/Shell.inf\r
!else\r
-!if $(USE_NEW_SHELL)\r
-INF RuleOverride = BINARY USE = X64 ShellBinPkg/UefiShell/UefiShell.inf\r
-!else\r
INF RuleOverride = BINARY USE = X64 EdkShellBinPkg/FullShell/FullShell.inf\r
!endif\r
-!endif\r
\r
FILE FREEFORM = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdLogoFile) {\r
SECTION RAW = MdeModulePkg/Logo/Logo.bmp\r
#\r
# Network modules\r
#\r
-!if $(NETWORK_ENABLE)\r
+!if $(E1000_ENABLE)\r
FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {\r
SECTION PE32 = Intel3.5/EFIX64/E3507X2.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/Udp4Dxe/Udp4Dxe.inf\r
INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf\r
INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf\r
-!endif\r
+ INF OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
\r
#\r
# Usb Support\r
INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf\r
!endif\r
\r
+INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
+INF OvmfPkg/PlatformDxe/Platform.inf\r
+\r
################################################################################\r
\r
[FV.FVMAIN_COMPACT]\r
\r
FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {\r
SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {\r
- SECTION FV_IMAGE = MAINFV\r
+ #\r
+ # These firmware volumes will have files placed in them uncompressed,\r
+ # and then both firmware volumes will be compressed in a single\r
+ # compression operation in order to achieve better overall compression.\r
+ #\r
+ SECTION FV_IMAGE = PEIFV\r
+ SECTION FV_IMAGE = DXEFV\r
}\r
}\r
\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
\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
+ RAW BIN Align = 16 |.bin\r
}\r