## @file\r
# Open Virtual Machine Firmware: FDF\r
#\r
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2011, 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|0x000EE000\r
+0x00000000|0x000EC000\r
FV = FVMAIN_COMPACT\r
\r
-0x000EE000|0x12000\r
+0x000EC000|0x14000\r
FV = SECFV\r
\r
################################################################################\r
\r
[FD.MEMFD]\r
BaseAddress = 0x800000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvBase\r
-Size = 0x400000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
+Size = 0x500000|gUefiOvmfPkgTokenSpaceGuid.PcdOvmfMemFvSize\r
ErasePolarity = 1\r
BlockSize = 0x10000\r
-NumBlocks = 0x40\r
+NumBlocks = 0x50\r
\r
-0x0|0x400000\r
+0x0|0x500000\r
FV = MAINFV\r
\r
################################################################################\r
INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r
INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
-INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
INF PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf\r
INF UefiCpuPkg/CpuDxe/CpuDxe.inf\r
INF IntelFrameworkModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2keyboardDxe.inf\r
INF IntelFrameworkModulePkg/Bus/Isa/IsaFloppyDxe/IsaFloppyDxe.inf\r
\r
+INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.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 RuleOverride=ACPITABLE OvmfPkg/AcpiTables/AcpiTables.inf\r
-INF OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf\r
\r
INF RuleOverride = BINARY FatBinPkg/EnhancedFatDxe/Fat.inf\r
+\r
+!if $(BUILD_NEW_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
# Network modules\r
#\r
!if $(NETWORK_ENABLE)\r
- FILE DRIVER = A5C9C8B3-5ABB-4be2-8CA6-2FF06F405D04 {\r
+ FILE DRIVER = 5D695E11-9B3F-4b83-B25F-4A8D5D69BE07 {\r
SECTION PE32 = Intel3.5/EFIX64/E3507X2.EFI\r
}\r
INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf\r
RAW RAW |.raw\r
}\r
\r
-[OptionRom.CirrusLogic5446]\r
-INF OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf {\r
+[OptionRom.OvmfVideo]\r
+INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {\r
PCI_DEVICE_ID = 0x00B8\r
}\r