## @file\r
# Open Virtual Machine Firmware: FDF\r
#\r
-# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2015, 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
!endif\r
!endif\r
\r
-!ifdef $(FD_SIZE_1MB)\r
-[FD.OVMF]\r
-BaseAddress = 0xFFF00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress\r
-Size = 0x00100000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize\r
-ErasePolarity = 1\r
-BlockSize = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize\r
-NumBlocks = 0x100\r
-!else\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 = 0xFFE00000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFdBaseAddress\r
-Size = 0x00200000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareFdSize\r
+BaseAddress = $(FW_BASE_ADDRESS)\r
+Size = $(FW_SIZE)\r
ErasePolarity = 1\r
-BlockSize = 0x1000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfFirmwareBlockSize\r
-NumBlocks = 0x200\r
-!endif\r
+BlockSize = $(BLOCK_SIZE)\r
+NumBlocks = $(FW_BLOCKS)\r
\r
!include VarStore.fdf.inc\r
\r
-!ifdef $(FD_SIZE_1MB)\r
-0x00020000|0x000CC000\r
+$(VARS_SIZE)|$(FVMAIN_SIZE)\r
FV = FVMAIN_COMPACT\r
\r
-0x000EC000|0x14000\r
+$(SECFV_OFFSET)|$(SECFV_SIZE)\r
FV = SECFV\r
\r
-!else\r
-0x00020000|0x001AC000\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 = $(BLOCK_SIZE)\r
+NumBlocks = $(CODE_BLOCKS)\r
+\r
+0x00000000|$(FVMAIN_SIZE)\r
FV = FVMAIN_COMPACT\r
\r
-0x001CC000|0x34000\r
+$(FVMAIN_SIZE)|$(SECFV_SIZE)\r
FV = SECFV\r
-!endif\r
\r
################################################################################\r
\r
#\r
INF OvmfPkg/Sec/SecMain.inf\r
\r
-INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/Bin/ResetVector.inf\r
+INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf\r
\r
################################################################################\r
[FV.PEIFV]\r
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
INF PcAtChipsetPkg/8254TimerDxe/8254Timer.inf\r
-INF PcAtChipsetPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
+INF OvmfPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
INF PcAtChipsetPkg/KbcResetDxe/Reset.inf\r
INF MdeModulePkg/Universal/Metronome/Metronome.inf\r
INF OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
INF OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf\r
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.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/RuntimeDxe/VariableRuntimeDxe.inf\r
- INF OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
-!else\r
- INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf\r
+ INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
!endif\r
\r
INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.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/Ip4ConfigDxe/Ip4ConfigDxe.inf\r
INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf\r
INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf\r
- INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.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
+!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 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
INF OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
\r
#\r
#\r
INF MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf\r
INF MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf\r
+INF MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
INF MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
INF MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf\r
\r
[Rule.Common.PEI_CORE]\r
FILE PEI_CORE = $(NAMED_GUID) {\r
- PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+ PE32 PE32 Align=Auto $(INF_OUTPUT)/$(MODULE_NAME).efi\r
UI STRING ="$(MODULE_NAME)" Optional\r
VERSION STRING ="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER)\r
}\r
[Rule.Common.PEIM]\r
FILE PEIM = $(NAMED_GUID) {\r
PEI_DEPEX PEI_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex\r
- PE32 PE32 Align=32 $(INF_OUTPUT)/$(MODULE_NAME).efi\r
+ PE32 PE32 Align=Auto $(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.SEC.RESET_VECTOR]\r
FILE RAW = $(NAMED_GUID) {\r
- RAW RAW |.raw\r
+ RAW BIN Align = 16 |.bin\r
}\r