From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com []) by mx.groups.io with SMTP id smtpd.web11.2469.1624416764968334886 for ; Tue, 22 Jun 2021 19:52:55 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: zhiguang.liu@intel.com) IronPort-SDR: 4+6Jh+JmCJlEQ8CPwy4NTws1n7iuyX4YtIDZH6w+9GmUSS3yfMXLKrQh3U6ulyR/+/sOK8mSuu 6TC0eLg+uv2Q== X-IronPort-AV: E=McAfee;i="6200,9189,10023"; a="204175545" X-IronPort-AV: E=Sophos;i="5.83,293,1616482800"; d="scan'208";a="204175545" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2021 19:52:55 -0700 IronPort-SDR: L4uF+/94pejJPY5RNNgFMeR2SpMLm/aOgMeoY1i2C2G0b27dBiqnO4W16N4GrNoswqWhDqV4NG qXAPxdS1F7Bg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,293,1616482800"; d="scan'208";a="487138331" Received: from fieedk002.ccr.corp.intel.com ([10.239.158.144]) by orsmga001.jf.intel.com with ESMTP; 22 Jun 2021 19:52:53 -0700 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Maurice Ma , Guo Dong , Benjamin You Subject: [Patch V2 08/12] UefiPayloadPkg: Include UniversalPayLoad modules in UefiPayloadPkg.dsc Date: Wed, 23 Jun 2021 10:52:31 +0800 Message-Id: <20210623025235.3311-9-zhiguang.liu@intel.com> X-Mailer: git-send-email 2.30.0.windows.2 In-Reply-To: <20210623025235.3311-1-zhiguang.liu@intel.com> References: <20210623025235.3311-1-zhiguang.liu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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/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.30.0.windows.2