UefiPayloadPkg: Remove PEI phase from Payload

[mirror_edk2.git] / UefiPayloadPkg / UefiPayloadPkg.fdf

diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf
index 570a8ee7fdc16b683b0607eb1ee78fd897344a2b..a97ace7395378f8f8f65c51d0e36c5f580849b7b 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -3,7 +3,7 @@
 #\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
@@ -13,13 +13,10 @@ DEFINE FD_BASE       = 0x00800000
 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
+\r
 DEFINE FD_SIZE     = 0x00410000\r
 DEFINE NUM_BLOCKS  = 0x410\r
 !endif\r
@@ -32,14 +29,11 @@ ErasePolarity = 1
 BlockSize     = $(FD_BLOCK_SIZE)\r
 NumBlocks     = $(NUM_BLOCKS)\r
 \r
-0x00000000|$(PEI_FV_SIZE)\r
-FV = PEIFV\r
-\r
-$(PEI_FV_SIZE)|$(DXE_FV_SIZE)\r
-FV = DXEFV\r
+0x00000000|$(FD_SIZE)\r
+FV = PLDFV\r
 \r
 ################################################################################\r
-[FV.PEIFV]\r
+[FV.PLDFV]\r
 BlockSize          = $(FD_BLOCK_SIZE)\r
 FvAlignment        = 16\r
 ERASE_POLARITY     = 1\r
@@ -58,14 +52,11 @@ 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
@@ -89,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