diff options
| author | Guo Dong <guo.dong@intel.com> | 2020-09-12 16:31:14 -0700 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2020-12-02 23:10:22 +0000 |
| commit | 7c4ab1c2ef60a4690177d2361f8dd44d7d7df7f8 (patch) | |
| tree | 80c5f10e2a80c005141851f8a2a7a076244dfc5e /UefiPayloadPkg/UefiPayloadPkg.fdf | |
| parent | 9fb629edd75e1ae1e7f4e85b0876107a7180899b (diff) | |
| download | edk2-7c4ab1c2ef60a4690177d2361f8dd44d7d7df7f8.tar.gz edk2-7c4ab1c2ef60a4690177d2361f8dd44d7d7df7f8.tar.bz2 edk2-7c4ab1c2ef60a4690177d2361f8dd44d7d7df7f8.zip | |
UefiPayloadPkg: Remove PEI phase from Payload
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3100
It is not necessary to have a PEI phase in the UEFI payload since no
specific PEI task is required. This patch adds a UefiPayloadEntry
driver to get UEFI Payload required information from the bootloaders,
convert them into a HOB list, load DXE core and transfer control to it.
Here is the change details:
1) Removed PEI phase, including Peicore, BlSupportPei, SecCore, etc.
2) Added UefiPayloadEntry driver. this is the only driver before DXE core.
3) Added Pure X64 support, dropped Pure IA32 (Could add later if required)
64bit payload with 32bit entry point is still supported.
4) Use one DSC file UefiPayloadPkg.dsc to support X64 and IA32X64 build.
Removed UefiPayloadIa32.dsc and UefiPayloadIa32X64.dsc
Tested with SBL and coreboot on QEMU.
Signed-off-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: Maurice Ma <maurice.ma@intel.com>
Reviewed-by: Benjamin You <benjamin.you@intel.com>
Diffstat (limited to 'UefiPayloadPkg/UefiPayloadPkg.fdf')
| -rw-r--r-- | UefiPayloadPkg/UefiPayloadPkg.fdf | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf index 570a8ee7fd..a97ace7395 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -3,7 +3,7 @@ #
# Provides drivers and definitions to create uefi payload for bootloaders.
#
-# Copyright (c) 2014 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>
# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
@@ -13,13 +13,10 @@ DEFINE FD_BASE = 0x00800000 DEFINE FD_BLOCK_SIZE = 0x00001000
!if $(TARGET) == "NOOPT"
-DEFINE PEI_FV_SIZE = 0x00050000
-DEFINE DXE_FV_SIZE = 0x00800000
DEFINE FD_SIZE = 0x00850000
DEFINE NUM_BLOCKS = 0x850
!else
-DEFINE PEI_FV_SIZE = 0x30000
-DEFINE DXE_FV_SIZE = 0x3E0000
+
DEFINE FD_SIZE = 0x00410000
DEFINE NUM_BLOCKS = 0x410
!endif
@@ -32,14 +29,11 @@ ErasePolarity = 1 BlockSize = $(FD_BLOCK_SIZE)
NumBlocks = $(NUM_BLOCKS)
-0x00000000|$(PEI_FV_SIZE)
-FV = PEIFV
-
-$(PEI_FV_SIZE)|$(DXE_FV_SIZE)
-FV = DXEFV
+0x00000000|$(FD_SIZE)
+FV = PLDFV
################################################################################
-[FV.PEIFV]
+[FV.PLDFV]
BlockSize = $(FD_BLOCK_SIZE)
FvAlignment = 16
ERASE_POLARITY = 1
@@ -58,14 +52,11 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE
READ_LOCK_STATUS = TRUE
-INF UefiPayloadPkg/SecCore/SecCore.inf
+INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
-INF MdeModulePkg/Core/Pei/PeiMain.inf
-INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-INF MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf
-INF MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf
-INF UefiPayloadPkg/BlSupportPei/BlSupportPei.inf
-INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+FILE FV_IMAGE = 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 {
+ SECTION FV_IMAGE = DXEFV
+}
################################################################################
@@ -89,11 +80,6 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE
READ_LOCK_STATUS = TRUE
-APRIORI DXE {
- INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
- INF MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
- INF MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf
-}
#
# DXE Phase modules
|