[PATCH 08/12] UefiPayloadPkg: Include UniversalPayLoad modules in UefiPayloadPkg.dsc


Zhiguang Liu
 

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>

Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
UefiPayloadPkg/UefiPayloadPkg.dsc | 22 ++++++++++++++++++----
UefiPayloadPkg/UefiPayloadPkg.fdf | 3 ++-
2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayload=
Pkg.dsc
index e3d669a6d6..155aea4bc4 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -196,7 +196,11 @@
TimerLib|UefiPayloadPkg/Library/AcpiTimerLib/AcpiTimerLib.inf=0D
ResetSystemLib|UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.inf=
=0D
SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort=
Lib16550.inf=0D
+!if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE=0D
+ PlatformHookLib|UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/P=
latformHookLib.inf=0D
+!else=0D
PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.i=
nf=0D
+!endif=0D
PlatformBootManagerLib|UefiPayloadPkg/Library/PlatformBootManagerLib/Pla=
tformBootManagerLib.inf=0D
IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf=0D
=0D
@@ -213,10 +217,12 @@
DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.i=
nf=0D
!endif=0D
PlatformSupportLib|UefiPayloadPkg/Library/PlatformSupportLibNull/Platfor=
mSupportLibNull.inf=0D
-!if $(BOOTLOADER) =3D=3D "COREBOOT"=0D
- BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf=0D
-!else=0D
- BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf=0D
+!if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE=0D
+ !if $(BOOTLOADER) =3D=3D "COREBOOT"=0D
+ BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf=0D
+ !else=0D
+ BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf=0D
+ !endif=0D
!endif=0D
=0D
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.in=
f=0D
@@ -383,10 +389,18 @@
=0D
!if "IA32" in $(ARCH)=0D
[Components.IA32]=0D
+ !if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE=0D
+ UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf=0D
+ !else=0D
UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf=0D
+ !endif=0D
!else=0D
[Components.X64]=0D
+ !if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE=0D
+ UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf=0D
+ !else=0D
UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf=0D
+ !endif=0D
!endif=0D
=0D
[Components.X64]=0D
diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload=
Pkg.fdf
index ed7fbcaddb..6073f9c1b4 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.fdf
+++ b/UefiPayloadPkg/UefiPayloadPkg.fdf
@@ -52,8 +52,9 @@ READ_STATUS =3D TRUE
READ_LOCK_CAP =3D TRUE=0D
READ_LOCK_STATUS =3D TRUE=0D
=0D
+!if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE=0D
INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf=0D
-=0D
+!endif=0D
FILE FV_IMAGE =3D 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 {=0D
SECTION FV_IMAGE =3D DXEFV=0D
}=0D
--=20
2.16.2.windows.1


Guo Dong
 

Reviewed-by: Guo Dong <guo.dong@intel.com>

-----Original Message-----
From: Liu, Zhiguang <zhiguang.liu@intel.com>
Sent: Sunday, June 20, 2021 8:47 AM
To: devel@edk2.groups.io
Cc: Ma, Maurice <maurice.ma@intel.com>; Dong, Guo
<guo.dong@intel.com>; You, Benjamin <benjamin.you@intel.com>
Subject: [PATCH 08/12] UefiPayloadPkg: Include UniversalPayLoad modules
in UefiPayloadPkg.dsc

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>

Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
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.in
f


SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort
Lib16550.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/DebugAgentLi
bNull.inf

!endif


PlatformSupportLib|UefiPayloadPkg/Library/PlatformSupportLibNull/Platfor
mSupportLibNull.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

}

--
2.16.2.windows.1