From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=l92g+8Cn; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: isaac.w.oram@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641954052; x=1673490052; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BDvyFUnEIsA4hQu3NDvLsbif+dkg/A661PaIim5RUus=; b=l92g+8CntsRwksdOi27/1xH4OW3IOO+EhS6/g56uWRWaM0umQYz+8Kks d5DyR0exGjAKQVksynxXDxWRDdP92RB2oGx1odTrtbmDusu1+XQ2xr9kS /4kRiyIUP/+pM5DVQIjH9anD3K65EqsCVbhYhrCajc0mm3GRwe+lC9VJd mODMcYawuF+SkcSotXGGKsUmqs4ffMYLEZKrGmaTeyvRns0W2FRRR268U Xl/It/UH+wP7K1hIRJgCdNSCxS1K4UT28Q28cfINNvDhiecb8NDF25i4z 6UOdYI7O5NY/h7CtfyK7J+M3xQAXBOF+ov0JuyTI+/q2MGNWtF4oNkzgJ Q==; 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" 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" 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> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- 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/LogoFeature.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 feature. -# -################################################################################ - -!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/UefiBootServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.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 ################################################################################ # @@ -71,31 +47,8 @@ # @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzilla.tianocore.org/show_bug.cgi?id=2308 # 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 == 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 appended to any -# standard flags that are defined by the build process. They can be -# applied for any modules or only those modules with the specific -# module style (EDK or EDKII) specified in [Components] section. -# -# For advanced features, it is recommended to enable [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 == 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 -[LibraryClasses] - [Guids] gLogoFeaturePkgTokenSpaceGuid = {0x567199de, 0xb448, 0x4aa0, {0x99, 0x4e, 0xd5, 0xd6, 0x82, 0x59, 0x91, 0x17}} 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 = IA32|X64 BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT + PEI_ARCH = IA32 + DXE_ARCH = X64 -[LibraryClasses] - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + LogoFeaturePkg/LogoFeaturePkg.dec -[LibraryClasses.common.DXE_DRIVER] - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf +[PcdsFeatureFlag] + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable |FALSE + # + # 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 -- 2.27.0.windows.1