BaseTools: Fix the ending character for Linux script BuildEnv

[mirror_edk2.git] / UefiPayloadPkg / UefiPayloadPkg.fdf

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index dfbcde5668490bd18a18252ffd0dd5ea8f73f1d7..a97ace7395378f8f8f65c51d0e36c5f580849b7b 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -3,28 +3,38 @@
 #\r
 # Provides drivers and definitions to create uefi payload for bootloaders.\r
 #\r
-# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>\r
 # SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 ##\r
 \r
+[Defines]\r
+DEFINE FD_BASE       = 0x00800000\r
+DEFINE FD_BLOCK_SIZE = 0x00001000\r
+\r
+!if $(TARGET) == "NOOPT"\r
+DEFINE FD_SIZE     = 0x00850000\r
+DEFINE NUM_BLOCKS  = 0x850\r
+!else\r
+\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
-FV = PEIFV\r
-\r
-0x00030000|0x3E0000\r
-FV = DXEFV\r
+0x00000000|$(FD_SIZE)\r
+FV = PLDFV\r
 \r
 ################################################################################\r
-[FV.PEIFV]\r
-BlockSize          = 0x1000\r
+[FV.PLDFV]\r
+BlockSize          = $(FD_BLOCK_SIZE)\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
 MEMORY_MAPPED      = TRUE\r
@@ -42,19 +52,16 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-INF UefiPayloadPkg/SecCore/SecCore.inf\r
+INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf\r
 \r
-INF MdeModulePkg/Core/Pei/PeiMain.inf\r
-INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
-INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf\r
-INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf\r
-INF UefiPayloadPkg/BlSupportPei/BlSupportPei.inf\r
-INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
+FILE FV_IMAGE = 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 {\r
+    SECTION FV_IMAGE = DXEFV\r
+}\r
 \r
 ################################################################################\r
 \r
 [FV.DXEFV]\r
-BlockSize          = 0x1000\r
+BlockSize          = $(FD_BLOCK_SIZE)\r
 FvForceRebase      = FALSE\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -73,11 +80,6 @@ READ_STATUS        = TRUE
 READ_LOCK_CAP      = TRUE\r
 READ_LOCK_STATUS   = TRUE\r
 \r
-APRIORI DXE {\r
-  INF  MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-  INF  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf\r
-  INF  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf\r
-}\r
 \r
 #\r
 # DXE Phase modules\r
@@ -131,7 +133,9 @@ INF MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
 INF MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf\r
 INF MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf\r
 INF MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf\r
+!if $(DISABLE_SERIAL_TERMINAL) == FALSE\r
 INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
+!endif\r
 INF UefiPayloadPkg/GraphicsOutputDxe/GraphicsOutputDxe.inf\r
 \r
 #\r