Update NetworkPkg package version to 0.95.

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32.fdf

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
index f47655cb623bc42676e288f19706f229d97ef2e0..e9714456336b7fc76a41208bdd086288a971afe9 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 - 2013, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2006 - 2014, 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
@@ -28,38 +28,52 @@ DEFINE FD_SIZE_1MB=
 !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
@@ -122,7 +136,7 @@ READ_LOCK_STATUS   = TRUE
 #\r
 INF  OvmfPkg/Sec/SecMain.inf\r
 \r
-INF  RuleOverride=RESET_VECTOR UefiCpuPkg/ResetVector/Vtf0/Bin/ResetVector.inf\r
+INF  RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf\r
 \r
 ################################################################################\r
 [FV.PEIFV]\r
@@ -438,5 +452,5 @@ FILE FV_IMAGE = 9E21FD93-9C72-4c15-8C4B-E77F1DB2D792 {
 \r
 [Rule.Common.SEC.RESET_VECTOR]\r
   FILE RAW = $(NAMED_GUID) {\r
-    RAW RAW                |.raw\r
+    RAW BIN   Align = 16   |.bin\r
   }\r