Fix wrong usage sizeof(SIZE).

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32X64.fdf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
index dd705a83fb63015f18c3eb1d533c8d0b32ae0424..67c5f9c4e0dd4da1777f3f266b7ee16665f9787e 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
@@ -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