UefiPayloadPkg:Fix NOOPT build failure

When build UEFI payload using NOOPT, it would build failure since
the FV size. So this patch increases FV size to support NOOPT.
If not NOOPT build, there is no change to FV size.

Signed-off-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index dfbcde5668490bd18a18252ffd0dd5ea8f73f1d7..a04fcd2ec23b8a9a5cddffb683f951dd1b93fc3f 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -8,23 +8,39 @@
 #\r
 ##\r
 \r
+[Defines]\r
+DEFINE FD_BASE       = 0x00800000\r
+DEFINE FD_BLOCK_SIZE = 0x00001000\r
+\r
+!if $(TARGET) == "NOOPT"\r
+DEFINE PEI_FV_SIZE = 0x00050000\r
+DEFINE DXE_FV_SIZE = 0x00800000\r
+DEFINE FD_SIZE     = 0x00850000\r
+DEFINE NUM_BLOCKS  = 0x850\r
+!else\r
+DEFINE PEI_FV_SIZE = 0x30000\r
+DEFINE DXE_FV_SIZE = 0x3E0000\r
+DEFINE FD_SIZE     = 0x00410000\r
+DEFINE NUM_BLOCKS  = 0x410\r
+!endif\r
+\r
 ################################################################################\r
 [FD.UefiPayload]\r
-BaseAddress   = 0x800000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemBase\r
-Size          = 0x410000|gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize\r
+BaseAddress   = $(FD_BASE) | gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemBase\r
+Size          = $(FD_SIZE) | gUefiPayloadPkgTokenSpaceGuid.PcdPayloadFdMemSize\r
 ErasePolarity = 1\r
-BlockSize     = 0x1000\r
-NumBlocks     = 0x410\r
+BlockSize     = $(FD_BLOCK_SIZE)\r
+NumBlocks     = $(NUM_BLOCKS)\r
 \r
-0x00000000|0x030000\r
+0x00000000|$(PEI_FV_SIZE)\r
 FV = PEIFV\r
 \r
-0x00030000|0x3E0000\r
+$(PEI_FV_SIZE)|$(DXE_FV_SIZE)\r
 FV = DXEFV\r
 \r
 ################################################################################\r
 [FV.PEIFV]\r
-BlockSize          = 0x1000\r
+BlockSize          = $(FD_BLOCK_SIZE)\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
 MEMORY_MAPPED      = TRUE\r
@@ -54,7 +70,7 @@ INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
 ################################################################################\r
 \r
 [FV.DXEFV]\r
-BlockSize          = 0x1000\r
+BlockSize          = $(FD_BLOCK_SIZE)\r
 FvForceRebase      = FALSE\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r