tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-24 22:24:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

UefiPayloadPkg: Include UniversalPayLoad modules in UefiPayloadPkg.dsc

Browse Source 
Add a new macro "UNIVERSAL_PAYLOAD" to build Universal Payload.

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
This commit is contained in:
Zhiguang Liu 2021-06-16 22:52:23 +08:00 committed by mergify[bot]
parent 27cb64fffc
commit 6b69f73b59
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
UefiPayloadPkg/UefiPayloadPkg.dsc
View File

@ -196,7 +196,11 @@
TimerLib|UefiPayloadPkg/Library/AcpiTimerLib/AcpiTimerLib.inf TimerLib|UefiPayloadPkg/Library/AcpiTimerLib/AcpiTimerLib.inf
ResetSystemLib|UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.inf ResetSystemLib|UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.inf
SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
!if $(UNIVERSAL_PAYLOAD) == TRUE
PlatformHookLib|UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/PlatformHookLib.inf
!else
PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.inf
!endif
PlatformBootManagerLib|UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf PlatformBootManagerLib|UefiPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf
@ -213,10 +217,12 @@
DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
!endif !endif
PlatformSupportLib|UefiPayloadPkg/Library/PlatformSupportLibNull/PlatformSupportLibNull.inf PlatformSupportLib|UefiPayloadPkg/Library/PlatformSupportLibNull/PlatformSupportLibNull.inf
!if $(BOOTLOADER) == "COREBOOT" !if $(UNIVERSAL_PAYLOAD) == FALSE
BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf !if $(BOOTLOADER) == "COREBOOT"
!else BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf
BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf !else
BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf
!endif
!endif !endif
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
@ -383,10 +389,18 @@
!if "IA32" in $(ARCH) !if "IA32" in $(ARCH)
[Components.IA32] [Components.IA32]
!if $(UNIVERSAL_PAYLOAD) == TRUE
UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
!else
UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
!endif
!else !else
[Components.X64] [Components.X64]
!if $(UNIVERSAL_PAYLOAD) == TRUE
UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf
!else
UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
!endif
!endif !endif
[Components.X64] [Components.X64]

3
UefiPayloadPkg/UefiPayloadPkg.fdf
View File

@ -52,8 +52,9 @@ READ_STATUS = TRUE
READ_LOCK_CAP = TRUE READ_LOCK_CAP = TRUE
READ_LOCK_STATUS = TRUE READ_LOCK_STATUS = TRUE
!if $(UNIVERSAL_PAYLOAD) == FALSE
INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf
!endif
FILE FV_IMAGE = 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 { FILE FV_IMAGE = 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 {
SECTION FV_IMAGE = DXEFV SECTION FV_IMAGE = DXEFV
} }