## @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/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 USE = X64 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 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
READ_LOCK_STATUS = TRUE\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
- }\r
- \r
+ SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRED = TRUE {\r
+ SECTION FV_IMAGE = MAINFV\r
+ }\r
+ }\r
+\r
################################################################################\r
\r
[Rule.Common.SEC]\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