From 6b69f73b5924530ffe0d1e3dc11e5f7284c66851 Mon Sep 17 00:00:00 2001 From: Zhiguang Liu Date: Wed, 16 Jun 2021 22:52:23 +0800 Subject: [PATCH] UefiPayloadPkg: Include UniversalPayLoad modules in UefiPayloadPkg.dsc Add a new macro "UNIVERSAL_PAYLOAD" to build Universal Payload. Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Reviewed-by: Guo Dong Signed-off-by: Zhiguang Liu --- UefiPayloadPkg/UefiPayloadPkg.dsc | 22 ++++++++++++++++++---- UefiPayloadPkg/UefiPayloadPkg.fdf | 3 ++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc index e3d669a6d6..155aea4bc4 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -196,7 +196,11 @@ TimerLib|UefiPayloadPkg/Library/AcpiTimerLib/AcpiTimerLib.inf ResetSystemLib|UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf +!if $(UNIVERSAL_PAYLOAD) == TRUE + PlatformHookLib|UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/PlatformHookLib.inf +!else PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf +!endif PlatformBootManagerLib|UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf @@ -213,10 +217,12 @@ DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf !endif PlatformSupportLib|UefiPayloadPkg/Library/PlatformSupportLibNull/PlatformSupportLibNull.inf -!if $(BOOTLOADER) == "COREBOOT" - BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf -!else - BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf +!if $(UNIVERSAL_PAYLOAD) == FALSE + !if $(BOOTLOADER) == "COREBOOT" + BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf + !else + BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf + !endif !endif DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf @@ -383,10 +389,18 @@ !if "IA32" in $(ARCH) [Components.IA32] + !if $(UNIVERSAL_PAYLOAD) == TRUE + UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf + !else UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf + !endif !else [Components.X64] + !if $(UNIVERSAL_PAYLOAD) == TRUE + UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf + !else UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf + !endif !endif [Components.X64] diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayloadPkg.fdf index ed7fbcaddb..6073f9c1b4 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -52,8 +52,9 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE +!if $(UNIVERSAL_PAYLOAD) == FALSE INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf - +!endif FILE FV_IMAGE = 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 { SECTION FV_IMAGE = DXEFV }