Use PCD for PMM size and EndOpromShadowAddress to remove hard code value in CSM module.

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32.fdf

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index 317c183910d552899e6ff374c867ddc921b7f942..04e5b65bec669029097e2a5b892d6e82f8e8a3d1 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.fdf
+++ b/OvmfPkg/OvmfPkgIa32.fdf
@@ -1,7 +1,7 @@
 ## @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
@@ -21,22 +21,22 @@ ErasePolarity = 1
 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
@@ -152,7 +152,6 @@ INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
 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
@@ -198,12 +197,24 @@ INF  IntelFrameworkModulePkg/Bus/Isa/IsaSerialDxe/IsaSerialDxe.inf
 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
 \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