Reviewed-by: <[email protected]> -----Original Message----- From: Dong, Guo <[email protected]> Sent: Thursday, December 22, 2022 5:25 AM To: [email protected] Cc: Dong, Guo <[email protected]>; Ni, Ray <[email protected]>; Rhodes, Sean <[email protected]>; Lu, James <[email protected]>; Guo, Gua <[email protected]> Subject: [edk2-devel][PATCH] UefiPayloadPkg: Fix boot issue for non-universal payload
From: Guo Dong <[email protected]> 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 <[email protected]> Cc: Sean Rhodes <[email protected]> Cc: James Lu <[email protected]> Cc: Gua Guo <[email protected]> Signed-off-by: Guo Dong <[email protected]> --- UefiPayloadPkg/UefiPayloadPkg.fdf | 7 ++++--- 1 file 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 #-- 2.35.1.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97713): https://edk2.groups.io/g/devel/message/97713 Mute This Topic: https://groups.io/mt/95815569/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
