From nobody Mon Feb 9 23:16:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+76783+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76783+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1624204053; cv=none; d=zohomail.com; s=zohoarc; b=JF/Hs5gaPruNEXFxZYlYKtV0UgEwsk3vYBdM829nO4JICsY95ji0GSNZuxMZPaOwXsX2bpQoQgNCbBi6BRfh4VpI+UVFNP1WGPVI802MeRGWj2UPwbo6gtPkmt7xYRYo/jfJSAu8TcVjJhpiDe6YEh5uPBJ/aGJGiqrqF6YvlSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624204053; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=QtyKhiFbkbsqM4ULIeNdMsbLLGl+jPQ/adgmG2FXdK0=; b=nwuC97gjQMjJi5Te2S9VOFOJtmn26X0ItkmAawoUmfCKeN4gOUY4FXI9Co8ynOL3nYEWIkSVHzf8URjguqNfRwi3V+qIEzFFMaUflPnuA/uuona4COcZH1z77fDRZsVgw5BzcEVT7eztJAaTa7+xHfN+cfT5EkbEGTepUvKPHns= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+76783+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1624204053337396.41430499524824; Sun, 20 Jun 2021 08:47:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id OzgDYY1788612xlJ0PvktKlK; Sun, 20 Jun 2021 08:47:33 -0700 X-Received: from mga18.intel.com (mga18.intel.com []) by mx.groups.io with SMTP id smtpd.web08.34931.1624204037148521455 for ; Sun, 20 Jun 2021 08:47:27 -0700 IronPort-SDR: x/I30cySNHRE9vEh10K5M7MloF3UheRcVrSTwcoYlRP7d5YyCeXJg46ltOZ0qol/E+1phjfHqT 4NhY+Z+DHHAA== X-IronPort-AV: E=McAfee;i="6200,9189,10021"; a="194044441" X-IronPort-AV: E=Sophos;i="5.83,287,1616482800"; d="scan'208";a="194044441" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jun 2021 08:47:27 -0700 IronPort-SDR: CvSe2mA8Q2fc9NrBXk6bdYp++OQHoebmWWXZ0Uc7LUBwADnFAFLJArepmQ38UageQC/dB1Plny f8TDxC4jTHvg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,287,1616482800"; d="scan'208";a="451932667" X-Received: from fieedk002.ccr.corp.intel.com ([10.239.158.144]) by orsmga008.jf.intel.com with ESMTP; 20 Jun 2021 08:47:26 -0700 From: "Zhiguang Liu" To: devel@edk2.groups.io Cc: Maurice Ma , Guo Dong , Benjamin You Subject: [edk2-devel] [PATCH 08/12] UefiPayloadPkg: Include UniversalPayLoad modules in UefiPayloadPkg.dsc Date: Sun, 20 Jun 2021 23:46:58 +0800 Message-Id: <20210620154702.2681-9-zhiguang.liu@intel.com> In-Reply-To: <20210620154702.2681-1-zhiguang.liu@intel.com> References: <20210620154702.2681-1-zhiguang.liu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhiguang.liu@intel.com X-Gm-Message-State: KkSr2GbXN0hbznbeREogwjDAx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1624204053; bh=2dUduSsVX85wPSM2H01BvU0pq8L2nUy0HOVAPuuTv+U=; h=Cc:Date:From:Reply-To:Subject:To; b=cF3ooaFTrP67ypdKQ/fp5DTdjKMGrDKM94Ot+14vzLrffEZABuebF30FXnEXQUbXP0q TMgaO/goaqZoGsfhv4lO546q7zZXg8Kd6BH+mT4iFElZsk6aj40IFgAIkOHdS6kbuOlKo 2SQwFTx2KCTvGeDPhespBOjtgYnMozMKGKM= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add a new macro "UNIVERSAL_PAYLOAD" to build Universal Payload. Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Signed-off-by: Zhiguang Liu Reviewed-by: Guo Dong --- 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 ResetSystemLib|UefiPayloadPkg/Library/ResetSystemLib/ResetSystemLib.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPort= Lib16550.inf +!if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE + PlatformHookLib|UefiPayloadPkg/Library/UniversalPayloadPlatformHookLib/P= latformHookLib.inf +!else PlatformHookLib|UefiPayloadPkg/Library/PlatformHookLib/PlatformHookLib.i= nf +!endif PlatformBootManagerLib|UefiPayloadPkg/Library/PlatformBootManagerLib/Pla= tformBootManagerLib.inf IoApicLib|PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf =20 @@ -213,10 +217,12 @@ DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.i= nf !endif PlatformSupportLib|UefiPayloadPkg/Library/PlatformSupportLibNull/Platfor= mSupportLibNull.inf -!if $(BOOTLOADER) =3D=3D "COREBOOT" - BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf -!else - BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf +!if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE + !if $(BOOTLOADER) =3D=3D "COREBOOT" + BlParseLib|UefiPayloadPkg/Library/CbParseLib/CbParseLib.inf + !else + BlParseLib|UefiPayloadPkg/Library/SblParseLib/SblParseLib.inf + !endif !endif =20 DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf @@ -383,10 +389,18 @@ =20 !if "IA32" in $(ARCH) [Components.IA32] + !if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE + UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf + !else UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf + !endif !else [Components.X64] + !if $(UNIVERSAL_PAYLOAD) =3D=3D TRUE + UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf + !else UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf + !endif !endif =20 [Components.X64] 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 READ_LOCK_STATUS =3D TRUE =20 +!if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf - +!endif FILE FV_IMAGE =3D 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 { SECTION FV_IMAGE =3D DXEFV } --=20 2.16.2.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#76783): https://edk2.groups.io/g/devel/message/76783 Mute This Topic: https://groups.io/mt/83669562/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-