## @file\r
# Open Virtual Machine Firmware: FDF\r
#\r
-# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2013, 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
+!ifndef $(FD_SIZE_2MB)\r
[FD.OVMF]\r
BaseAddress = 0xFFF00000\r
Size = 0x00100000\r
\r
0x000EC000|0x14000\r
FV = SECFV\r
+!else\r
+[FD.OVMF]\r
+BaseAddress = 0xFFE00000\r
+Size = 0x00200000\r
+ErasePolarity = 1\r
+BlockSize = 0x1000\r
+NumBlocks = 0x200\r
+\r
+0x00000000|0x001CC000\r
+FV = FVMAIN_COMPACT\r
+\r
+0x001CC000|0x34000\r
+FV = SECFV\r
+!endif\r
\r
################################################################################\r
\r
[FD.MEMFD]\r
BaseAddress = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase\r
-Size = 0x600000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
+Size = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
ErasePolarity = 1\r
BlockSize = 0x10000\r
-NumBlocks = 0x60\r
+NumBlocks = 0x80\r
\r
-0x0|0x600000\r
+0x0|0x800000\r
FV = MAINFV\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
}\r
\r
INF PcAtChipsetPkg/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf\r
\r
INF OvmfPkg/BlockMmioToBlockIoDxe/BlockIo.inf\r
+INF OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
+INF OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
INF OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf\r
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf\r
\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
\r
INF RuleOverride = BINARY 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 ShellBinPkg/UefiShell/UefiShell.inf\r
-!else\r
INF RuleOverride = BINARY 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/EFI32/E3507E2.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