From nobody Mon Feb 9 23:39:46 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+85601+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+85601+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954063; cv=none; d=zohomail.com; s=zohoarc; b=YrgDSI2BXDzueBs6R178snZ2MerqruyaBJkx5PQ3yZkiCHjb+ZPPlHnXQwPuUqsiSNbFF8s+TEUCwPbggwXoNUpkqeGsoOpCOuhn6mILIu5JaP7hV/9lTSWBPfv0X4w9VK9iDqrHF6WUN2D4zbnhRppu2J42OqLp5G7C/odqxEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954063; 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=pTgsAKHWLytTUA7sBmUuAqF8wPAIi91/wTPVxTctzNQ=; b=nGIeFLAUyHsjKsiibvFozcDo5snkLLpATpBSwZPwMInMFlWe8ZKb3vNP0t6mTCJqoouMKKDyscVpIZrd3xyG4mZieRshaASmwr1fyyzZRvVayDe/dgI0s89F6P/Q6Q4uNI8S/9KNupOLVlXzrGkKIsCaevhu8XAo4ro1b+lAd7Q= 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+85601+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 1641954063127252.05475094616065; Tue, 11 Jan 2022 18:21:03 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id DbShYY1788612xHTTxnWZsdG; Tue, 11 Jan 2022 18:21:02 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.17892.1641954049038531757 for ; Tue, 11 Jan 2022 18:20:52 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439831" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439831" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2022 18:20:49 -0800 X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="528990326" X-Received: from iworam-desk.amr.corp.intel.com ([10.7.150.79]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jan 2022 18:20:49 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Dandan Bi , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 16/27] LogoFeaturePkg: Use MinPlatformPkg build include files Date: Tue, 11 Jan 2022 18:20:16 -0800 Message-Id: <9f30fd1a6651141e59c69725423f1e658475939e.1641953242.git.isaac.w.oram@intel.com> In-Reply-To: References: 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,isaac.w.oram@intel.com X-Gm-Message-State: iJIZB5uUnpDETnfDjH2goFPfx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954062; bh=NGk4k07olFzVKH9gYdfSL71N8RBqHAmxAGs7yuOqNSg=; h=Cc:Date:From:Reply-To:Subject:To; b=mWp06gSlaJJv2NknJZ9TqavtMJlqTkZs8y6OFulYBR/cZ9TjeSMQ7ugPnU8wg5etxJU hntqlb3vA3qyQ8ZyNgGszpgswYcseG+Q61o+RpRFivYa8TiYPGjjwMyGqL6CoUyWrciaS yQF7CuaOVfR0TJLq+t5J5XIQsm7VA+BZvfs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954064190100034 Content-Type: text/plain; charset="utf-8" Use the MinPlatformPkg common core build files to build libraries needed by this feature. Cc: Dandan Bi Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc | 69 += +++---------------- Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec | 2 - Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc | 38 += +++++++--- 3 files changed, 41 insertions(+), 68 deletions(-) diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeatur= e.dsc b/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc index 1898be12ed..0acce1c7df 100644 --- a/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc +++ b/Features/Intel/UserInterface/LogoFeaturePkg/Include/LogoFeature.dsc @@ -18,36 +18,12 @@ # ##########################################################################= ###### [Defines] -!ifndef $(PEI_ARCH) - !error "PEI_ARCH must be specified to build this feature!" -!endif -!ifndef $(DXE_ARCH) - !error "DXE_ARCH must be specified to build this feature!" -!endif - -##########################################################################= ###### -# -# Library Class section - list of all Library Classes needed by this featu= re. -# -##########################################################################= ###### - -!include MdePkg/MdeLibs.dsc.inc - -[LibraryClasses] - ####################################### - # Edk2 Packages - ####################################### - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf - -[LibraryClasses.common.DXE_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf + !ifndef $(PEI_ARCH) + !error "PEI_ARCH must be specified to build this feature!" + !endif + !ifndef $(DXE_ARCH) + !error "DXE_ARCH must be specified to build this feature!" + !endif =20 ##########################################################################= ###### # @@ -71,31 +47,8 @@ # @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 # is completed. [Components.X64] - ##################################### - # Logo Feature Package - ##################################### - - # Add library instances here that are not included in package components= and should be tested - # in the package build. - - # Add components here that should be included in the package build. -!if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable =3D=3D TRUE - LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf -!else - LogoFeaturePkg/LogoDxe/LogoDxe.inf -!endif - -##########################################################################= ######################### -# -# BuildOptions Section - Define the module specific tool chain flags that = should be used as -# the default flags for a module. These flags are a= ppended to any -# standard flags that are defined by the build proc= ess. They can be -# applied for any modules or only those modules wit= h the specific -# module style (EDK or EDKII) specified in [Compone= nts] section. -# -# For advanced features, it is recommended to enabl= e [BuildOptions] in -# the applicable INF file so it does not affect the= whole board package -# build when this DSC file is active. -# -##########################################################################= ######################### -[BuildOptions] + !if gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable =3D=3D TRUE + LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf + !else + LogoFeaturePkg/LogoDxe/LogoDxe.inf + !endif diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec= b/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec index 1418eb2137..4fa7dfea0f 100644 --- a/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec +++ b/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec @@ -21,8 +21,6 @@ [Includes] Include =20 -[LibraryClasses] - [Guids] gLogoFeaturePkgTokenSpaceGuid =3D {0x567199de, 0xb448, 0x4aa0, {0x99, = 0x4e, 0xd5, 0xd6, 0x82, 0x59, 0x91, 0x17}} =20 diff --git a/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc= b/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc index fca413b46b..5a6436178c 100644 --- a/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc +++ b/Features/Intel/UserInterface/LogoFeaturePkg/LogoFeaturePkg.dsc @@ -21,17 +21,39 @@ SUPPORTED_ARCHITECTURES =3D IA32|X64 BUILD_TARGETS =3D DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER =3D DEFAULT + PEI_ARCH =3D IA32 + DXE_ARCH =3D X64 =20 -[LibraryClasses] - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + LogoFeaturePkg/LogoFeaturePkg.dec =20 -[LibraryClasses.common.DXE_DRIVER] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf +[PcdsFeatureFlag] + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE =20 + # + # PCD needed for MinPlatform build includes + # + gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable = |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable = |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable = |FALSE + +# +# Include common libraries +# +!include MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +!include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +!include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc + +# +# This package always builds the feature. +# +!include Include/LogoFeature.dsc + +# +# Since the feature include only builds the x64 BMP version, allow building +# all drivers in this package in 32b or 64b modes +# [Components] LogoFeaturePkg/LogoDxe/JpegLogoDxe.inf LogoFeaturePkg/LogoDxe/LogoDxe.inf --=20 2.27.0.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 (#85601): https://edk2.groups.io/g/devel/message/85601 Mute This Topic: https://groups.io/mt/88365345/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-