diff options
| author | Guo Dong <guo.dong@intel.com> | 2022-12-21 11:36:37 -0700 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2022-12-22 17:16:54 +0000 |
| commit | d8d4abdff9096a69ff59d96ac4a8dd0e19e5cbcc (patch) | |
| tree | 824b527c9bd343b4e16e522ae0b3172a0944aef7 /UefiPayloadPkg | |
| parent | 538ac013d6a673842d780c88b7b3c21730260e8e (diff) | |
| download | edk2-d8d4abdff9096a69ff59d96ac4a8dd0e19e5cbcc.tar.gz edk2-d8d4abdff9096a69ff59d96ac4a8dd0e19e5cbcc.tar.bz2 edk2-d8d4abdff9096a69ff59d96ac4a8dd0e19e5cbcc.zip | |
UefiPayloadPkg: Fix boot issue for non-universal payload
BDS module was moved from DXEFV to newly created BDSFV recently.
Non-universal UEFI payload doesn't support multiple FV, so it failed
to boot since BDS module could not be found.
This patch add BDS back to DXEFV when UNIVERSAL_PAYLOAD is not set.
Cc: Ray Ni <ray.ni@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Cc: James Lu <james.lu@intel.com>
Cc: Gua Guo <gua.guo@intel.com>
Signed-off-by: Guo Dong <guo.dong@intel.com>
Reviewed-by: James Lu <james.lu@intel.com>
Reviewed-by: Gua Guo <gua.guo@intel.com>
Diffstat (limited to 'UefiPayloadPkg')
| -rw-r--r-- | UefiPayloadPkg/UefiPayloadPkg.fdf | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf index 94ba922244..ee7d718b3f 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -59,9 +59,6 @@ INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf FILE FV_IMAGE = 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 {
SECTION FV_IMAGE = DXEFV
}
-FILE FV_IMAGE = FBE6C1E3-2F80-4770-88B0-494186E3346F {
- SECTION FV_IMAGE = BDSFV
-}
################################################################################
[FV.BDSFV]
@@ -277,6 +274,10 @@ INF MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
!endif
+!if $(UNIVERSAL_PAYLOAD) == FALSE
+INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
+!endif
+
#
# UEFI network modules
#
|