From nobody Mon Apr 29 00:08:26 2024 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+85584+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+85584+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954050; cv=none; d=zohomail.com; s=zohoarc; b=NYgDOiD1011RHgWsJKXgh84Te/aSIieCZMuvHSRGFfUoh+RVuI0NObfByNtIAoVQvGzK5OHHo/SFucF5pzr4eUjrUChk4i1ggvINpRnmkVPUD7D8kZGIrMPF9wHcz4FohY0XIXSfG6inS8AGtdUN9lfp+Mv0Ap4Lj0bfFQRWjDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954050; 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=sj+K1eczDkeG43aWchjSDmBY1UrPUOpYytuFDKHKk6Y=; b=iBk6KnVYKqlmHdRjIX2GXGUTH2aGofLT46IXyg5MEJjWauhao8jkL/+88PdwqL1Cnqnqg8TtGH3DBzs4AhKvz+GCP0zO+LJDU8edJPCNC5IlHwTlJ6xyM9gGbvLiYQg4Bil/udZn0LM0PLDxOfWDl8IjDUZinBgmajGuINxzUTs= 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+85584+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 164195405091950.89866959010885; Tue, 11 Jan 2022 18:20:50 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id CGHSYY1788612xkecWzEPQ7W; Tue, 11 Jan 2022 18:20:50 -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:50 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439815" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439815" 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:48 -0800 X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="528990279" 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:48 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Sai Chaganty , Liming Gao , Eric Dong , Ming Tan Subject: [edk2-devel][edk2-platforms][PATCH V1 01/27] BeepDebugFeaturePkg: Use MinPlatformPkg build include files Date: Tue, 11 Jan 2022 18:20:01 -0800 Message-Id: <201dca4c4494241ebb61d4fa32d51385db12b9b4.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: 6fDNuAY2TwBEm6nGRZ35piibx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954050; bh=PyE9gez8ArkNPkXTTHJ8xzEVWPNnO1A0IRUAPvG4uc8=; h=Cc:Date:From:Reply-To:Subject:To; b=B4JjEyHi2Dpp5fzoITOWFPzbYThj6EOMcVDjYwz4ZJLGq0FMtXUBFCs45fpCAFhby8t Z/8f/Rn6vVt4hcUldy5eQXKwWPx39evNij4Hz4tI4ysxtbzutY9v/k8+uX1QAy/I+F+Ae 8JlFgdXupqL2S/FS1C4WTU+QavtzwQ5BtM0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954053136100005 Content-Type: text/plain; charset="utf-8" The BeepDebugFeaturePkg was malformed and did not build anything and thus wasn't testable in standalone build. Added gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable to properly control the advanced feature inclusion. Use the standard MinPlatform includes for core libraries. This increases the build time, but reduces complexity when integrating into a board build. Board build optimization is more valuable than standalone build optimization. Enable standalone build to test the library build and the component builds using edk2 StatusCodeHandler drivers. Add unique file names for the StatusCodeHandler components to avoid collisions with any existing board handlers when incorporated in board DSC and FDF files. Add PreMemory.fdf and PostMemory.fdf content for including in board FDF or AdvancedFeaturePkg in the future. Removed unused sections in DSC and FDF to reduce file clutter. Removed stale file header content from prior proprietary licensing. Moved feature customization and common include into the package DSC file to reduce board complexity when BeepDebugFeature.dsc is included. Removed the FixedAtBuild build control for beep feature as it would be redundant with the FeatureFlag control of the whole feature. Build control is via PcdBeepDebugFeatureEnable and dynamic control is via PcdStatusCodeUseBeep. Improved Readme content, format, and coding style use. Cc: Sai Chaganty Cc: Liming Gao Cc: Eric Dong Cc: Ming Tan Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dec = | 7 +- Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc = | 28 +++ Features/Intel/Debugging/BeepDebugFeaturePkg/Include/BeepDebugFeature.dsc = | 222 ++++++-------------- Features/Intel/Debugging/BeepDebugFeaturePkg/Include/Library/BeepLib.h = | 6 +- Features/Intel/Debugging/BeepDebugFeaturePkg/Include/PostMemory.fdf = | 14 ++ Features/Intel/Debugging/BeepDebugFeaturePkg/Include/PreMemory.fdf = | 13 ++ Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHandler= Lib/PeiBeepStatusCodeHandlerLib.inf | 5 +- Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHandler= Lib/RuntimeDxeBeepStatusCodeHandlerLib.inf | 3 - Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHandler= Lib/SmmBeepStatusCodeHandlerLib.inf | 3 - Features/Intel/Debugging/BeepDebugFeaturePkg/Readme.md = | 91 +++++--- 10 files changed, 186 insertions(+), 206 deletions(-) diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeatureP= kg.dec b/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.d= ec index 4f4b36b091..d90611da51 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dec +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dec @@ -31,6 +31,9 @@ [Guids] gBeepDebugFeaturePkgTokenSpaceGuid =3D {0x54f56fb5, 0xea0e, 0x4518, {0= xa0, 0x3e, 0x1b, 0xeb, 0x56, 0x94, 0xd2, 0x16}} =20 -[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] +[PcdsFeatureFlag] + gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable|FALSE|BOOLE= AN|0x00000000 + +[PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] # Beep is a legacy feature, disabled it by default - gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep|FALSE|BOOLEAN|0x= 00000001 + gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep|TRUE|BOOLEAN|0x0= 0000001 diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeatureP= kg.dsc b/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.d= sc index 47254f9974..56cad020bf 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/BeepDebugFeaturePkg.dsc @@ -24,6 +24,34 @@ PEI_ARCH =3D IA32 DXE_ARCH =3D X64 =20 +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + BeepDebugFeaturePkg/BeepDebugFeaturePkg.dec + +[PcdsFeatureFlag] + # + # PCD needed for MinPlatform build includes + # + gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable = |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable = |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable = |FALSE + +[PcdsDynamicExDefault] + gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep|TRUE + +# +# Include common libraries +# +!include MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +!include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +!include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc + +[LibraryClasses.Common] + # + # Required by common status code handler infrastructure + # + PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf + # # This package always builds the feature. # diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/BeepDebug= Feature.dsc b/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/BeepDebu= gFeature.dsc index b24b3e458f..251de6932b 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/BeepDebugFeature= .dsc +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/BeepDebugFeature= .dsc @@ -18,97 +18,16 @@ # ##########################################################################= ###### [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 - -##########################################################################= ###### -# -# PCD Section - list of PCD Entries modified by the feature. -# -##########################################################################= ###### - -# Unmark the following and StatusCodeHandler.efi to build the .dsc file di= rectly -#[PcdsDynamicDefault] -# gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep|TRUE - -##########################################################################= ###### -# -# 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/BaseMemoryLib/BaseMemoryLib.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf - IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplat= e.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf - PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf - -[LibraryClasses.common.PEIM] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf - MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf - PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf - -[LibraryClasses.IA32.PEIM,LibraryClasses.IA32.PEI_CORE,LibraryClasses.IA32= .SEC] - ####################################### - # Edk2 Packages - ####################################### - ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRepor= tStatusCodeLib.inf - -[LibraryClasses.common.DXE_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - -[LibraryClasses.common.DXE_RUNTIME_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf - ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/R= untimeDxeReportStatusCodeLib.inf - -[LibraryClasses.common.UEFI_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - -[LibraryClasses.X64.DXE_SMM_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableL= ib.inf - MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAlloc= ationLib.inf - SmmIoLib|MdePkg/Library/SmmIoLib/SmmIoLib.inf - SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf - ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmRepor= tStatusCodeLib.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 + + DEFINE BEEP_PEIM_FILENAME =3D b2356504-8ea3-42bd-912a-4b331990644a + DEFINE BEEP_DXE_FILENAME =3D f1211fa9-d83d-4c79-8726-3afaebba1070 + DEFINE BEEP_SMM_FILENAME =3D a82cd452-0f17-4417-b8be-bb8cfdf9fa26 =20 ##########################################################################= ###### # @@ -128,77 +47,60 @@ # Feature PEI Components # =20 -# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 -# is completed. +# +# By default, make the functional control a patcheable in module PCD +# +[PcdsPatchableInModule] + gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep + +[LibraryClasses.Common] + BeepLib|Debugging/BeepDebugFeaturePkg/Library/BeepLib/BeepLibNull.inf + BeepMapLib|Debugging/BeepDebugFeaturePkg/Library/BeepMapLib/BeepMapLib.i= nf + +[LibraryClasses.PEIM, LibraryClasses.PEI_CORE] + StatusCodeHandlerLib|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCod= eHandlerLib/PeiBeepStatusCodeHandlerLib.inf + +[LibraryClasses.DXE_RUNTIME_DRIVER] + StatusCodeHandlerLib|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCod= eHandlerLib/RuntimeDxeBeepStatusCodeHandlerLib.inf + +[LibraryClasses.DXE_SMM_DRIVER] + StatusCodeHandlerLib|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCod= eHandlerLib/SmmBeepStatusCodeHandlerLib.inf + [Components.IA32] - ##################################### - # Beep Debug Feature Package - ##################################### =20 - # Add library instances here that are not included in package components= and should be tested - # in the package build. - BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/PeiBeepStatusCodeHa= ndlerLib.inf + MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf { + + # + # Many boards already have StatusCodeHandler components built from t= he common core code + # Providing a unique name avoids collisions. Both status code handl= er components will + # install their listeners with the status code routers. + # + FILE_GUID =3D $(BEEP_PEIM_FILENAME) + + NULL|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/= PeiBeepStatusCodeHandlerLib.inf + } =20 - # The following is an example for used with StatusCodeHandler: -# MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf { -# -# OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/O= emHookStatusCodeLibNull.inf -# SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLib= Null.inf -# BeepLib|BeepDebugFeaturePkg/Library/BeepLib/BeepLibNull.inf -# BeepMapLib|BeepDebugFeaturePkg/Library/BeepMapLib/BeepMapLib.inf -# NULL|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/PeiBeepSta= tusCodeHandlerLib.inf -# } - - # Add components here that should be included in the package build. - -# -# Feature DXE Components -# - -# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 -# is completed. [Components.X64] - ##################################### - # Beep Debug Feature Package - ##################################### + MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRun= timeDxe.inf { + + # + # Many boards already have StatusCodeHandler components built from t= he common core code + # Providing a unique name avoids collisions. Both status code handl= er components will + # install their listeners with the status code routers. + # + FILE_GUID =3D $(BEEP_DXE_FILENAME) + + NULL|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/= RuntimeDxeBeepStatusCodeHandlerLib.inf + } =20 - # Add library instances here that are not included in package components= and should be tested - # in the package build. - BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/RuntimeDxeBeepStatu= sCodeHandlerLib.inf - BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/SmmBeepStatusCodeHa= ndlerLib.inf - - # The following is an example for used with StatusCodeHandler: -# MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRun= timeDxe.inf { -# -# OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/O= emHookStatusCodeLibNull.inf -# SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLib= Null.inf -# BeepLib|BeepDebugFeaturePkg/Library/BeepLib/BeepLibNull.inf -# BeepMapLib|BeepDebugFeaturePkg/Library/BeepMapLib/BeepMapLib.inf -# NULL|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/RuntimeDxe= BeepStatusCodeHandlerLib.inf -# } - -# MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf { -# -# OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/O= emHookStatusCodeLibNull.inf -# SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLib= Null.inf -# BeepLib|BeepDebugFeaturePkg/Library/BeepLib/BeepLibNull.inf -# BeepMapLib|BeepDebugFeaturePkg/Library/BeepMapLib/BeepMapLib.inf -# NULL|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/SmmBeepSta= tusCodeHandlerLib.inf -# } - - # Add components here that should be included in the package build. - -##########################################################################= ######################### -# -# 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] + MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf { + + # + # Many boards already have StatusCodeHandler components built from t= he common core code + # Providing a unique name avoids collisions. Both status code handl= er components will + # install their listeners with the status code routers. + # + FILE_GUID =3D $(BEEP_SMM_FILENAME) + + NULL|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/= SmmBeepStatusCodeHandlerLib.inf + } diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/Library/B= eepLib.h b/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/Library/Bee= pLib.h index f768acc557..0b8f71b097 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/Library/BeepLib.h +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/Library/BeepLib.h @@ -15,12 +15,12 @@ Sends the 32-bit value specified by Value to Beep device, and returns Va= lue. Some implementations of this library function may perform I/O operations directly to Beep device. Other implementations may send Value to - ReportStatusCode(), and the status code reporting mechanism will eventua= lly + ReportStatusCode (), and the status code reporting mechanism will eventu= ally display the 32-bit value on the status reporting device. =20 - Beep() must actively prevent recursion. If Beep() is called while + Beep () must actively prevent recursion. If Beep () is called while processing another Post Code Library function, then - Beep() must return Value immediately. + Beep () must return Value immediately. =20 @param Value Beep count. **/ diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/PostMemor= y.fdf b/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/PostMemory.fdf new file mode 100644 index 0000000000..447fb88235 --- /dev/null +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/PostMemory.fdf @@ -0,0 +1,14 @@ +## @file +# FDF file for post-memory BeepDebugFeature advanced feature. +# +# This file is intended to be included into another package so advanced f= eatures +# can be conditionally included in the flash image by enabling the respec= tive +# feature via its FeaturePCD. +# +# Copyright (C) 2022 Intel Corporation. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +INF FILE_GUID =3D $(BEEP_DXE_FILENAME) MdeModulePkg/Universal/StatusCodeHa= ndler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf +INF FILE_GUID =3D $(BEEP_SMM_FILENAME) MdeModulePkg/Universal/StatusCodeHa= ndler/Smm/StatusCodeHandlerSmm.inf diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/PreMemory= .fdf b/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/PreMemory.fdf new file mode 100644 index 0000000000..160f5e3ffd --- /dev/null +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/PreMemory.fdf @@ -0,0 +1,13 @@ +## @file +# FDF file for pre-memory BeepDebugFeature advanced feature. +# +# This file is intended to be included into another package so advanced f= eatures +# can be conditionally included in the flash image by enabling the respec= tive +# feature via its FeaturePCD. +# +# Copyright (C) 2022 Intel Corporation. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +INF FILE_GUID =3D $(BEEP_PEIM_FILENAME) MdeModulePkg/Universal/StatusCodeH= andler/Pei/StatusCodeHandlerPei.inf diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatu= sCodeHandlerLib/PeiBeepStatusCodeHandlerLib.inf b/Features/Intel/Debugging/= BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/PeiBeepStatusCodeHandl= erLib.inf index 421b246663..5be78a72e8 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHa= ndlerLib/PeiBeepStatusCodeHandlerLib.inf +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHa= ndlerLib/PeiBeepStatusCodeHandlerLib.inf @@ -4,9 +4,6 @@ # Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # -# vendor. This file may not be modified, except as allowed by -# additional terms of your license agreement. -# ## =20 [Defines] @@ -15,7 +12,7 @@ FILE_GUID =3D C4210E71-0A38-4728-8D25-4876348AA380 MODULE_TYPE =3D PEIM CONSTRUCTOR =3D PeiBeepStatusCodeHandlerLibConstructor - LIBRARY_CLASS =3D StatusCodeHandlerLib|SEC PEIM PEI_COR + LIBRARY_CLASS =3D StatusCodeHandlerLib|SEC PEIM PEI_CORE =20 # # The following information is for reference only and not required by the = build tools. diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatu= sCodeHandlerLib/RuntimeDxeBeepStatusCodeHandlerLib.inf b/Features/Intel/Deb= ugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/RuntimeDxeBeepS= tatusCodeHandlerLib.inf index b9aae39128..2343e35a78 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHa= ndlerLib/RuntimeDxeBeepStatusCodeHandlerLib.inf +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHa= ndlerLib/RuntimeDxeBeepStatusCodeHandlerLib.inf @@ -4,9 +4,6 @@ # Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # -# vendor. This file may not be modified, except as allowed by -# additional terms of your license agreement. -# ## =20 [Defines] diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatu= sCodeHandlerLib/SmmBeepStatusCodeHandlerLib.inf b/Features/Intel/Debugging/= BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/SmmBeepStatusCodeHandl= erLib.inf index caa82264ae..4db1748fe3 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHa= ndlerLib/SmmBeepStatusCodeHandlerLib.inf +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHa= ndlerLib/SmmBeepStatusCodeHandlerLib.inf @@ -4,9 +4,6 @@ # Copyright (c) 2010 - 2020, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # -# vendor. This file may not be modified, except as allowed by -# additional terms of your license agreement. -# ## =20 [Defines] diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/Readme.md b/Featu= res/Intel/Debugging/BeepDebugFeaturePkg/Readme.md index ee254d0f99..6626c9b764 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/Readme.md +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/Readme.md @@ -6,25 +6,29 @@ More Information: =20 ## Purpose -The BeepDebugFeaturePkg include some useful beep debug libraries, such as = get beep value from status code and beep. -This is an important capability in firmware development to get and analyze= the early error when there is not serial port. +Very often it is necessary to debug very close to the reset vector or in p= roduction systems that lack serial ports, seven segment displays, or useful= LED that are typically used to output useful debug messages. =20 +The BeepDebugFeaturePkg includes some useful beep focused debug libraries. + +This isn't intended for production use. + +There is not currently seamless integration into the SecCore component tha= t handles the reset vector. In order to debug that early, it will be necess= ary to use the BeepLib directly in SEC code. =20 # High-Level Theory of Operation -It provide a library BeepStatusCodeHandlerLib used by edk2 StatusCodeHandl= er.efi, used to do beep if needed. -It also provide a library of BeepMap lib, it map the status code to beep v= alue. +It provides a library, BeepStatusCodeHandlerLib, used by edk2 StatusCodeHa= ndler.efi, used to do beep if needed. +It also provide a library of BeepMap lib which maps the status code to a b= eep value. A library of Beep lib is needed by platform, and this pkg has a Null imple= mentation. =20 -In the library contstructor function, BeepStatusCodeHandlerLib register th= e call back function for ReportStatusCode. -When called, it call GetBeepFromStatusCode() in BeepMapLib to get beep val= ue from status code, and call Beep() in BeepLib to beep. +In the library contstructor function, BeepStatusCodeHandlerLib registers t= he call back function for ReportStatusCode. When called, it calls GetBeepFr= omStatusCode (); in BeepMapLib to get beep value from status code, and call= s Beep () in BeepLib to beep a speaker. =20 -BeepStatusCodeHandlerLib include 3 libraries for PEI, RuntimeDxe, SMM: +BeepStatusCodeHandlerLib includes three libraries for PEI, RuntimeDxe, and= SMM: * PeiBeepStatusCodeHandlerLib * RuntimeDxeBeepStatusCodeHandlerLib * SmmBeepStatusCodeHandlerLib =20 ## Firmware Volumes -Linked with StatusCodeHandler.efi, and make sure put the StatusCodeHandler= .efi after the ReportStatusCodeRouter.efi. +These libraries need to be linked into StatusCodeHandler components. +Make sure one puts the StatusCodeHandler.efi after the ReportStatusCodeRou= ter.efi. =20 ## Modules * BeepStatusCodeHandlerLib @@ -32,13 +36,17 @@ Linked with StatusCodeHandler.efi, and make sure put th= e StatusCodeHandler.efi a * BeepLibNull =20 ## BeepStatusCodeHandlerLib -This library register the call back function for ReportStatusCode, and get= beep valude from status code, and do beep. +This library registers the callback function for ReportStatusCode, gets be= ep value from status code, and does the beep. =20 ## BeepMapLib -This library provide a function to get beep value from status code. +This library provides a function to get a beep value for a status code. + +## BeepLibNull +This library provide a function to perform the beep. =20 ## Key Functions * In PeiBeepStatusCodeHandlerLib: +``` EFI_STATUS EFIAPI BeepStatusCodeReportWorker ( @@ -49,8 +57,10 @@ This library provide a function to get beep value from s= tatus code. IN CONST EFI_GUID *CallerId, IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL ) +``` =20 * In RuntimeDxeBeepStatusCodeHandlerLib: +``` EFI_STATUS EFIAPI BeepStatusCodeReportWorker ( @@ -60,8 +70,10 @@ This library provide a function to get beep value from s= tatus code. IN EFI_GUID *CallerId, IN EFI_STATUS_CODE_DATA *Data OPTIONAL ) +``` =20 * In SmmBeepStatusCodeHandlerLib: +``` EFI_STATUS EFIAPI BeepStatusCodeReportWorker ( @@ -71,55 +83,72 @@ This library provide a function to get beep value from = status code. IN EFI_GUID *CallerId, IN EFI_STATUS_CODE_DATA *Data OPTIONAL ) +``` =20 * In BeepMapLib: +``` UINT32 EFIAPI GetBeepValueFromStatusCode ( IN EFI_STATUS_CODE_TYPE CodeType, IN EFI_STATUS_CODE_VALUE Value - ) + ) +``` =20 * In BeepLib: +``` VOID EFIAPI Beep ( IN UINT32 Value - ) + ) +``` =20 ## Configuration -* Link the library to StatusCodeHandler.efi. - Example: - MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf { - - NULL|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/RuntimeDxe= BeepStatusCodeHandlerLib.inf - } - Refer to BeepDebugFeature.dsc for other example. -* Config PCD gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep. - In platform .dsc file, need to config the type of gBeepDebugFeaturePkgTo= kenSpaceGuid.PcdStatusCodeUseBeep. - Use PcdsFixedAtBuild to save binary size, and use PcdsDynamic if want to= enable/disable in runtime. -* Implemented platform's special BeepMapLib if needed. -* Provide the platform's special BeepLib. -* Make sure put the StatusCodeHandler.efi after the ReportStatusCodeRouter= .efi. +* Configure PCD gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep. + In board DSC file, the board developer needs to configure the type of gB= eepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep control desired. + [PcdsFixedAtBuild] is the feature default value as this has lowest size. + [PcdsDynamicExDefault] is the most common configuration as it provides d= ynamic control during debugging. +* Implemented board specific BeepMapLib if custom status code to beep code= mapping as needed. +* Provide the board specific BeepLib to perform beeps on the board specifi= c hardware. +```The default library does not cause any hardware to beep``` =20 ## Data Flows Status Code (ReportStatusCode) -> Beep Value (GetBeepValueFromStatusCode). =20 ## Control Flows -ReportStatusCode() -> BeepStatusCodeReportWorker() -> GetBeepValueFromStat= usCode() -> Beep() +ReportStatusCode () -> BeepStatusCodeReportWorker () -> GetBeepValueFromSt= atusCode () -> Beep () =20 ## Build Flows -There is not special build flows. +Standalone build +* build -a IA32 -a X64 -p Debugging\BeepDebugFeaturePkg\BeepDebugFeaturePk= g.dsc =20 +AdvanceFeaturePkg build +* build -a IA32 -a X64 -p AdvancedFeaturePkg/AdvancedFeaturePkg.dsc ## Test Point Results -Verify the post code shown is correct. +None =20 ## Functional Exit Criteria N/A =20 ## Feature Enabling Checklist -* Set the PCD gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep to T= RUE. -* Plug out all the memory, check can here the beep. +* Verify in board DSC file that gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeep= DebugFeatureEnable set to TRUE +* Verify board specific BeepLib implemented and included in board DSC file. +* Verify that the board has a PlatformHookLib instance. There is a null l= ibrary implementation if needed +``` + PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePla= tformHookLibNull.inf +``` +* Verify that your board has the StatusCodeHandler components (PEIM or dri= ver) desired. +``` + Example: + MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf { + + NULL|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/RuntimeDxe= BeepStatusCodeHandlerLib.inf + } + There are default StatusCodeHandlers for PEI, RT, and SMM in BeepDebugFe= aturePkg/Include in PreMemory.fdf and PostMemory.fdf for use. But most boa= rds will already have these components and you will just want to add the ap= propriate *StatusCodeHandlerLib.inf to each component. +``` +* Build +* Remove all the memory from the system and verify audible beep is heard w= hen attempting to boot. =20 ## Common Optimizations -* Implemented platform's special BeepMapLib if needed. +N/A --=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 (#85584): https://edk2.groups.io/g/devel/message/85584 Mute This Topic: https://groups.io/mt/88365328/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- From nobody Mon Apr 29 00:08:26 2024 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+85585+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+85585+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954052; cv=none; d=zohomail.com; s=zohoarc; b=JG7yhtnrYYjtzkDIbPxF5wB4xyskrsnXf3Tt11Dag3aX64mkNrG/PVYBqhKrjzt0lYEsrT8pyBQC+aG60ZLmgGIjpte3d2dkMyQlxsHAfghXZfO04h21x+c/VJjDNBdF68PHfG4yjtH43jAQ4KBQiNZADkQvBzmokNZLQ1WfufE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954052; 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=sBGP7mXuh5wx2+T32XF3l34Ww9m6gPnO8RAFVanDcZ4=; b=fxUVAoOyBdkZw9dzv0gZfPiAXilpBgN0Nn347kBZeXMfmVG0DnoFIwWFjJtIUAZ7xSFouA8or9N0c0v4dBK7w6jntpkN02XU7iR8nUnAtUhznWjoQrpT/nDl24B+7h3RZwoddQZbnX6F9op1vKfzcJjO1l80C9Alakl3mlUu0vQ= 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+85585+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 1641954052910594.6021263341999; Tue, 11 Jan 2022 18:20:52 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id xzgjYY1788612x4coR47YurJ; Tue, 11 Jan 2022 18:20:52 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.18083.1641954049814035968 for ; Tue, 11 Jan 2022 18:20:50 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439816" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439816" 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:48 -0800 X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="528990282" 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:48 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Sai Chaganty , Liming Gao , Eric Dong Subject: [edk2-devel][edk2-platforms][PATCH V1 02/27] BeepDebugFeaturePkg: Fix all relative package paths Date: Tue, 11 Jan 2022 18:20:02 -0800 Message-Id: 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: Q7RshLhJf2cy0iBg9UUbmKIzx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954052; bh=ArJPlmod4M00yjoLvM6qu7oMZ9cLLnSeks7IEq+xwHk=; h=Cc:Date:From:Reply-To:Subject:To; b=PeVqQkD+oKghYntvnsVo5bcv/26qkzVo1p90LU5VBNRjjRh98G7LKMpGggFHTDEQv20 xibxhl8f4ITsq1a0YmyGvmK1hxxGCwYbwEURaxpvJArzVsKI2+4omdxD4B0suqKbs4vLa k6LWxbN8+bBq1FUz4NcgQDLooYm8WehE4cE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954053384100014 Content-Type: text/plain; charset="utf-8" Packages should be at the root of a PACKAGES_PATH entry. At some point, paths were relative to edk2-platforms/Features/Intel which was functional, but interferes with the proper functioning of packaging tools. Cc: Sai Chaganty Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone Reviewed-by: Sai Chaganty --- Features/Intel/Debugging/BeepDebugFeaturePkg/Include/BeepDebugFeature.dsc = | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/BeepDebug= Feature.dsc b/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/BeepDebu= gFeature.dsc index 251de6932b..00ef022657 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/BeepDebugFeature= .dsc +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/Include/BeepDebugFeature= .dsc @@ -54,17 +54,17 @@ gBeepDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUseBeep =20 [LibraryClasses.Common] - BeepLib|Debugging/BeepDebugFeaturePkg/Library/BeepLib/BeepLibNull.inf - BeepMapLib|Debugging/BeepDebugFeaturePkg/Library/BeepMapLib/BeepMapLib.i= nf + BeepLib|BeepDebugFeaturePkg/Library/BeepLib/BeepLibNull.inf + BeepMapLib|BeepDebugFeaturePkg/Library/BeepMapLib/BeepMapLib.inf =20 [LibraryClasses.PEIM, LibraryClasses.PEI_CORE] - StatusCodeHandlerLib|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCod= eHandlerLib/PeiBeepStatusCodeHandlerLib.inf + StatusCodeHandlerLib|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLi= b/PeiBeepStatusCodeHandlerLib.inf =20 [LibraryClasses.DXE_RUNTIME_DRIVER] - StatusCodeHandlerLib|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCod= eHandlerLib/RuntimeDxeBeepStatusCodeHandlerLib.inf + StatusCodeHandlerLib|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLi= b/RuntimeDxeBeepStatusCodeHandlerLib.inf =20 [LibraryClasses.DXE_SMM_DRIVER] - StatusCodeHandlerLib|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCod= eHandlerLib/SmmBeepStatusCodeHandlerLib.inf + StatusCodeHandlerLib|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLi= b/SmmBeepStatusCodeHandlerLib.inf =20 [Components.IA32] =20 @@ -77,7 +77,7 @@ # FILE_GUID =3D $(BEEP_PEIM_FILENAME) - NULL|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/= PeiBeepStatusCodeHandlerLib.inf + NULL|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/PeiBeepSta= tusCodeHandlerLib.inf } =20 [Components.X64] @@ -90,7 +90,7 @@ # FILE_GUID =3D $(BEEP_DXE_FILENAME) - NULL|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/= RuntimeDxeBeepStatusCodeHandlerLib.inf + NULL|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/RuntimeDxe= BeepStatusCodeHandlerLib.inf } =20 MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf { @@ -102,5 +102,5 @@ # FILE_GUID =3D $(BEEP_SMM_FILENAME) - NULL|Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/= SmmBeepStatusCodeHandlerLib.inf + NULL|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/SmmBeepSta= tusCodeHandlerLib.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 (#85585): https://edk2.groups.io/g/devel/message/85585 Mute This Topic: https://groups.io/mt/88365329/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- From nobody Mon Apr 29 00:08:26 2024 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+85586+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+85586+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954051; cv=none; d=zohomail.com; s=zohoarc; b=ChFU9tTb2aEcFbyyoMu6ZPoGhhIoIEBaROormsdcJpcTqWQJfyj5UfTy87DhDL3GY2uBLWNg+fQ2BCXpsb9+KmWmfuVhuqPJrm4pHC90rEuf0rz1C0rzDuf0btirU5Vz0tfnm/gtRtiTMoKb9dN0h/+7XiqdPMHt4Ph850YOIpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954051; 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=c217ci4oBo3E0tPWLn6XirUkadYCRpwKPffi5SYa/KA=; b=YunaIm46CtU1Zwq+SZ+UehwIH5kYD6hCTUV2A+F2eavFpdbY4OT07u8utCZ/3KvaqjCrmQ9cLVpnnC6KdHZepcuO7zMif/46COmzS/MHIDLra6obHb5ZQiGjD70p4bL8yfHhna8ZN+zuAotwqflOX0HnEM/F+y9FDGhEok/8zU0= 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+85586+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 1641954051932316.2273741679552; Tue, 11 Jan 2022 18:20:51 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id mtv1YY1788612xqIjZbncaC6; Tue, 11 Jan 2022 18:20:51 -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:50 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439817" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439817" 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:48 -0800 X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="528990285" 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:48 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Sai Chaganty , Liming Gao , Eric Dong Subject: [edk2-devel][edk2-platforms][PATCH V1 03/27] AcpiDebugFeaturePkg: Fix all relative package paths Date: Tue, 11 Jan 2022 18:20:03 -0800 Message-Id: <1f3504427e80419ba2c09b26cd635336ae76e5d1.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: PJSVuy3pgzAtJ6mYVaSYkGmax1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954051; bh=RwCZ25ot9v8uqhm1a7ynuOpfZ3oV9XKXttwYkw9YrwY=; h=Cc:Date:From:Reply-To:Subject:To; b=gYCR3RXDmtvKIoXQZuyRkoQcomMtXqtin5suf6Z783mO+BE3gSvnqCYL9BB0weXNqp0 ioEQi4ICX2YJ+8tNW0ERHAQx0SGFo8KoLWwfIaXVWROXcEO4lOicwDmRHMvLvKuA5rzFY +SPysPPLu18WZc4+/qLTqB1DpaqeR2PXBiE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954053219100009 Content-Type: text/plain; charset="utf-8" Packages should be at the root of a PACKAGES_PATH entry. At some point, paths were relative to edk2-platforms/Features/Intel which was functional, but interferes with the proper functioning of packaging tools. Cc: Sai Chaganty Cc: Liming Gao Cc: Eric Dong Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone Reviewed-by: Sai Chaganty --- Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.= inf | 2 +- Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.= inf | 2 +- Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec = | 2 +- Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc = | 4 ++-- Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf = | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/A= cpiDebugDxe.inf b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxe= Smm/AcpiDebugDxe.inf index b293d83cd9..04b5953bf6 100644 --- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebu= gDxe.inf +++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebu= gDxe.inf @@ -32,7 +32,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec + AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec =20 [Pcd] gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureActive ## CONSUMES diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/A= cpiDebugSmm.inf b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxe= Smm/AcpiDebugSmm.inf index dbb33e4ae2..a0058b51ab 100644 --- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebu= gSmm.inf +++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebu= gSmm.inf @@ -33,7 +33,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec + AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec =20 [Pcd] gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureActive ## CONSUMES diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeatureP= kg.dec b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.d= ec index c3bd89fe2b..9159231007 100644 --- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec +++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec @@ -29,7 +29,7 @@ [PcdsFeatureFlag] gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable|FALSE|BOOLE= AN|0xA0000001 =20 -[PcdsFixedAtBuild,PcdsPatchableInModule,PcdsDynamic,PcdsDynamicEx] +[PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] ## This PCD specifies the ACPI debug message buffer size. gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugBufferSize|0x10000|UINT32= |0xF0000001 =20 diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebug= Feature.dsc b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebu= gFeature.dsc index 856222a53d..b142978be1 100644 --- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature= .dsc +++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature= .dsc @@ -109,8 +109,8 @@ # in the package build. =20 # Add components here that should be included in the package build. - Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf - Debugging/AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.inf + AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf + AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.inf =20 ##########################################################################= ######################### # diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemor= y.fdf b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf index bbd6eca87b..84560dae50 100644 --- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf +++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf @@ -7,5 +7,5 @@ # ## =20 - INF RuleOverride =3D DRIVER_ACPITABLE Debugging/AcpiDebugFeaturePkg/Acpi= DebugDxeSmm/AcpiDebugDxe.inf - INF RuleOverride =3D DRIVER_ACPITABLE Debugging/AcpiDebugFeaturePkg/Acpi= DebugDxeSmm/AcpiDebugSmm.inf + INF RuleOverride =3D DRIVER_ACPITABLE AcpiDebugFeaturePkg/AcpiDebugDxeSm= m/AcpiDebugDxe.inf + INF RuleOverride =3D DRIVER_ACPITABLE AcpiDebugFeaturePkg/AcpiDebugDxeSm= m/AcpiDebugSmm.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 (#85586): https://edk2.groups.io/g/devel/message/85586 Mute This Topic: https://groups.io/mt/88365330/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- From nobody Mon Apr 29 00:08:26 2024 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+85588+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+85588+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954055; cv=none; d=zohomail.com; s=zohoarc; b=TNvId7epA9dgv40fKT0POO2/nU3TSc9TEFtIqRiyCze0SMSwBBZayII1JnOM44Ps2AoPQK6nKqSBD8tT/r+Huieu/jHCp/IvkHNYxEI/DXTnly6bxHoAhKV6OH5Z3lizm6SjYH4Xkswka7KTuB7d/3sf4B7UaOamgDU4HK+Gc8E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954055; 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=OCdhrYXxVGxnIYoORWK/NzdsB1ZZ/dmd0JzyPNNMmFU=; b=cfzy2TiUrf1Pwo+4gVh2+GJ0xYCJb/d7MSS3ApAWL6tFqhCDGsYyZX7ee7FH9GOUOSP0yw6PoMfy107LyOjykj2tduJ1hqd7ZcE64QPikLyubRIW0/l9Clw+HQZF4cJr+ICxL42dIOki80Cz1xtUb+Z1sYEKi31BjH0w2F61oXA= 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+85588+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 1641954055476792.6953662841167; Tue, 11 Jan 2022 18:20:55 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id II7pYY1788612xKXQaUI10vn; Tue, 11 Jan 2022 18:20:54 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.18083.1641954049814035968 for ; Tue, 11 Jan 2022 18:20:50 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439818" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439818" 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:48 -0800 X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="528990288" 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:48 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Liming Gao , Nate DeSimone Subject: [edk2-devel][edk2-platforms][PATCH V1 04/27] IpmiFeaturePkg: Fix all relative package paths Date: Tue, 11 Jan 2022 18:20:04 -0800 Message-Id: <4af4fb8bee59021e48b84873fbfccc6d51b831f9.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: JAJf9jCCUQPgk9fOmDiq2PRWx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954054; bh=EqdhtWjAg1lffKY+e5mP4mRQ+xOZweEc2xZMckwZOVs=; h=Cc:Date:From:Reply-To:Subject:To; b=v1Us55pZydmxuIyu4uM3bZsXeiM4dO6EWUHxdXj+uL0Wyk0Ly3+Ir6FmHbXLovnai3h cinebu3GZqI922Wc8yBm4adTwuVf25OcpFqcm0+EoG1xLdO22aC+DtdMLwChbxhENamsm HQmIwrQZ7b/fP/siYGZewmZmnwB0DQ3II8E= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954057637100025 Content-Type: text/plain; charset="utf-8" Packages should be at the root of a PACKAGES_PATH entry. At some point, paths were relative to edk2-platforms/Features/Intel which was functional, but interferes with the proper functioning of packaging tools. Cc: Liming Gao Cc: Nate DeSimone Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf = | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog.inf = | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf = | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf = | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/GenericI= pmi.inf | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGener= icIpmi.inf | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Smm/SmmGener= icIpmi.inf | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature.dsc = | 36 ++++++++++---------- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMemory.fdf = | 16 ++++----- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMemory.fdf = | 6 ++-- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru.inf = | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf= | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf= | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib/Ipmi= BaseLib.inf | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLibNull/= IpmiBaseLibNull.inf | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCommandLib/I= pmiCommandLib.inf | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatformHook= LibNull/IpmiPlatformHookLibNull.inf | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiBaseLib/P= eiIpmiBaseLib.inf | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/S= mmIpmiBaseLib.inf | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf = | 2 +- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolStatus.inf = | 2 +- 21 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcA= cpi.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi= .inf index a84813f55c..7cd60e417b 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf @@ -22,7 +22,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] UefiBootServicesTableLib diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcE= log.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog= .inf index 665b3d9bda..388dd2740c 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog.inf @@ -21,7 +21,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] UefiDriverEntryPoint diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.i= nf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf index 85836cd8ee..61222e0c00 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf @@ -21,7 +21,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] UefiBootServicesTableLib diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.i= nf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf index 7ad00ae574..797dbe6a07 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf @@ -20,7 +20,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] PeimEntryPoint diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/= Dxe/GenericIpmi.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Gen= ericIpmi/Dxe/GenericIpmi.inf index 9881f9e3d0..8d80aeb6b5 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/Gen= ericIpmi.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/Gen= ericIpmi.inf @@ -36,7 +36,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] MemoryAllocationLib diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/= Pei/PeiGenericIpmi.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/= GenericIpmi/Pei/PeiGenericIpmi.inf index 883a9168e5..a646161ce1 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/Pei= GenericIpmi.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/Pei= GenericIpmi.inf @@ -33,7 +33,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] PeimEntryPoint diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/= Smm/SmmGenericIpmi.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/= GenericIpmi/Smm/SmmGenericIpmi.inf index a534f7dac8..f430195d1e 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Smm/Smm= GenericIpmi.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Smm/Smm= GenericIpmi.inf @@ -27,7 +27,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] MemoryAllocationLib diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Ipmi= Feature.dsc b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Ipm= iFeature.dsc index a6eccb428b..c1ce340da2 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature= .dsc +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature= .dsc @@ -47,8 +47,8 @@ ##################################### # IPMI Feature Package ##################################### - IpmiCommandLib|OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCommandLib= /IpmiCommandLib.inf - IpmiPlatformHookLib|OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatf= ormHookLibNull/IpmiPlatformHookLibNull.inf + IpmiCommandLib|IpmiFeaturePkg/Library/IpmiCommandLib/IpmiCommandLib.inf + IpmiPlatformHookLib|IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiP= latformHookLibNull.inf =20 [LibraryClasses.common.PEI_CORE,LibraryClasses.common.PEIM] ####################################### @@ -65,7 +65,7 @@ ##################################### # IPMI Feature Package ##################################### - IpmiBaseLib|OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiBaseLib/Pe= iIpmiBaseLib.inf + IpmiBaseLib|IpmiFeaturePkg/Library/PeiIpmiBaseLib/PeiIpmiBaseLib.inf =20 [LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.UEFI_DRIVER] ####################################### @@ -82,7 +82,7 @@ ##################################### # IPMI Feature Package ##################################### - IpmiBaseLib|OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib/IpmiB= aseLib.inf + IpmiBaseLib|IpmiFeaturePkg/Library/IpmiBaseLib/IpmiBaseLib.inf =20 ##########################################################################= ###### # @@ -112,14 +112,14 @@ # Add library instances here that are not included in package components= and should be tested # in the package build. =20 - OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiP= latformHookLibNull.inf + IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.i= nf =20 # # Add components here that should be included in the package build. # - OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.inf - OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf - OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf + IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.inf + IpmiFeaturePkg/Frb/FrbPei.inf + IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf =20 # # Feature DXE Components @@ -135,20 +135,20 @@ # Add library instances here that are not included in package components= and should be tested # in the package build. =20 - OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiP= latformHookLibNull.inf + IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull.i= nf =20 # # Add components here that should be included in the package build. # - OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf - OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib= .inf - OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf - OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog.inf - OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf - OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru.inf - OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf - OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf - OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolStatus.inf + IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf + IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf + IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf + IpmiFeaturePkg/BmcElog/BmcElog.inf + IpmiFeaturePkg/Frb/FrbDxe.inf + IpmiFeaturePkg/IpmiFru/IpmiFru.inf + IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf + IpmiFeaturePkg/OsWdt/OsWdt.inf + IpmiFeaturePkg/SolStatus/SolStatus.inf =20 ##########################################################################= ######################### # diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Post= Memory.fdf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Post= Memory.fdf index cbd9453cf0..158b5455d8 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMemory.= fdf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMemory.= fdf @@ -7,11 +7,11 @@ # ## =20 - INF OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf - INF OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf - INF RuleOverride =3D DRIVER_ACPITABLE OutOfBandManagement/IpmiFeaturePkg= /BmcAcpi/BmcAcpi.inf - INF OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog.inf - INF OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf - INF OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru.inf - INF OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf - INF OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolStatus.inf + INF IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf + INF IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf + INF RuleOverride =3D DRIVER_ACPITABLE IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf + INF IpmiFeaturePkg/BmcElog/BmcElog.inf + INF IpmiFeaturePkg/Frb/FrbDxe.inf + INF IpmiFeaturePkg/IpmiFru/IpmiFru.inf + INF IpmiFeaturePkg/OsWdt/OsWdt.inf + INF IpmiFeaturePkg/SolStatus/SolStatus.inf diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreM= emory.fdf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMe= mory.fdf index 826490952b..d214988bd1 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMemory.f= df +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMemory.f= df @@ -7,6 +7,6 @@ # ## =20 -INF OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.inf -INF OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf -INF OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf +INF IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.inf +INF IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf +INF IpmiFeaturePkg/Frb/FrbPei.inf diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/Ipmi= Fru.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru= .inf index 0778b221c1..322f061a0f 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru.inf @@ -21,7 +21,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] UefiDriverEntryPoint diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/Dxe= IpmiInit.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/D= xeIpmiInit.inf index 831bfb0b5e..8236fe4842 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpmiIni= t.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpmiIni= t.inf @@ -21,7 +21,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] UefiBootServicesTableLib diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/Pei= IpmiInit.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/P= eiIpmiInit.inf index 607a185eb6..3fb31c729a 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmiIni= t.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmiIni= t.inf @@ -21,7 +21,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] PeimEntryPoint diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/Ipmi= BaseLib/IpmiBaseLib.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg= /Library/IpmiBaseLib/IpmiBaseLib.inf index 86df943560..72ca3495fb 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib= /IpmiBaseLib.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib= /IpmiBaseLib.inf @@ -18,7 +18,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] UefiBootServicesTableLib diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/Ipmi= BaseLibNull/IpmiBaseLibNull.inf b/Features/Intel/OutOfBandManagement/IpmiFe= aturePkg/Library/IpmiBaseLibNull/IpmiBaseLibNull.inf index 5478f9842b..52f8863032 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib= Null/IpmiBaseLibNull.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib= Null/IpmiBaseLibNull.inf @@ -24,7 +24,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] BaseLib diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/Ipmi= CommandLib/IpmiCommandLib.inf b/Features/Intel/OutOfBandManagement/IpmiFeat= urePkg/Library/IpmiCommandLib/IpmiCommandLib.inf index f8e7ba5a8f..d5c14ff2a4 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCommand= Lib/IpmiCommandLib.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCommand= Lib/IpmiCommandLib.inf @@ -24,7 +24,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] BaseMemoryLib diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/Ipmi= PlatformHookLibNull/IpmiPlatformHookLibNull.inf b/Features/Intel/OutOfBandM= anagement/IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLi= bNull.inf index ab270079aa..8e472ebdad 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatfor= mHookLibNull/IpmiPlatformHookLibNull.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatfor= mHookLibNull/IpmiPlatformHookLibNull.inf @@ -20,7 +20,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] DebugLib diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiI= pmiBaseLib/PeiIpmiBaseLib.inf b/Features/Intel/OutOfBandManagement/IpmiFeat= urePkg/Library/PeiIpmiBaseLib/PeiIpmiBaseLib.inf index 9a2c87873f..234492db65 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiBase= Lib/PeiIpmiBaseLib.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiBase= Lib/PeiIpmiBaseLib.inf @@ -18,7 +18,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] DebugLib diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmI= pmiBaseLib/SmmIpmiBaseLib.inf b/Features/Intel/OutOfBandManagement/IpmiFeat= urePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf index bb1ccf1ca2..7ea688fc16 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBase= Lib/SmmIpmiBaseLib.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBase= Lib/SmmIpmiBaseLib.inf @@ -18,7 +18,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] UefiBootServicesTableLib diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.= inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf index 7e7d2826cb..3fd1078271 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf @@ -20,7 +20,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [LibraryClasses] UefiDriverEntryPoint diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/So= lStatus.inf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/S= olStatus.inf index 826144e537..9019b849ac 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolStatus= .inf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolStatus= .inf @@ -21,7 +21,7 @@ =20 [Packages] MdePkg/MdePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec =20 [Pcd] gIpmiFeaturePkgTokenSpaceGuid.PcdMaxSOLChannels --=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 (#85588): https://edk2.groups.io/g/devel/message/85588 Mute This Topic: https://groups.io/mt/88365332/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- From nobody Mon Apr 29 00:08:26 2024 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+85589+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+85589+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954056; cv=none; d=zohomail.com; s=zohoarc; b=D62G5iebZ0A+nnm9VBZAowk1YKxqtwBevoHBvjtV/2bBp8DuChT4GW/pDJijdpbKaFN9XGivw0Q/wcBztw7ibEip0caGXTnpZALmigLq9rYGMRYPYjHdZ5pOJAsBrnFi+B1nwNvcjHxDTHMcHgsw5ZYMSTTYRqiKHXK1rf1WQsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954056; 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=zOErBDuzwtsKtdswT+37ZKWhCN/D/pn7a+Rfj5980hc=; b=TdnC9xVfmFefpstLFrJj2+JnTf/sFzukxJeQNaiI7h/DBYeRF1BTWSt/8dnNbULhL7UFYIRrOiulBp9VW7yGRuj3u38HtyXajIM86De7KxeE6VXDuZmAGMucw9VGS8aHJoiYNjW6V+H2ixNq4QqPgDk2mxahgSZuuHL1aekIJwo= 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+85589+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 1641954056206148.1857932375416; Tue, 11 Jan 2022 18:20:56 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id t1ghYY1788612x3PHrkHPXA0; Tue, 11 Jan 2022 18:20:55 -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:50 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439819" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439819" 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:48 -0800 X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="528990291" 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:48 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Nate DeSimone , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 05/27] IpmiFeaturePkg: Fix build errors Date: Tue, 11 Jan 2022 18:20:05 -0800 Message-Id: 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: Dpo2wF5W8r0FFriVh4hkf7eox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954055; bh=kTzlEFAy+LN86z2RPYPxurG88WagyOLAONBSeCmqYfM=; h=Cc:Date:From:Reply-To:Subject:To; b=vU79+0Yu0u2zw8oGZoBoC+Av7NVuvsthybmgMraGxvjhnuKBHHb0aIJLG2L7sQVP4WK NRdhHrSjqNczpheut7U640/ghCPJGWgT/gv73Zk0NMzcToxOd8I+vbgu79at16pbzWrfK tR0iK2HcEA8yEvS1AX6RPWgo0WzyRVwBuPQ= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954057672100026 Content-Type: text/plain; charset="utf-8" Fix build issues with standalone build. Switch to using MinPlatformPkg common core include for common modules. Cc: Nate DeSimone Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature.dsc = | 54 -------------------- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMemory.fdf = | 16 +++--- Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc = | 18 +++++++ 3 files changed, 26 insertions(+), 62 deletions(-) diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Ipmi= Feature.dsc b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Ipm= iFeature.dsc index c1ce340da2..237a4fc006 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature= .dsc +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature= .dsc @@ -34,54 +34,15 @@ !include MdePkg/MdeLibs.dsc.inc =20 [LibraryClasses] - ####################################### - # Edk2 Packages - ####################################### - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf IpmiLib|MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplat= e.inf =20 - ##################################### - # IPMI Feature Package - ##################################### IpmiCommandLib|IpmiFeaturePkg/Library/IpmiCommandLib/IpmiCommandLib.inf IpmiPlatformHookLib|IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiP= latformHookLibNull.inf =20 [LibraryClasses.common.PEI_CORE,LibraryClasses.common.PEIM] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf - MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf - PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf - PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf - ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRepor= tStatusCodeLib.inf - - ##################################### - # IPMI Feature Package - ##################################### IpmiBaseLib|IpmiFeaturePkg/Library/PeiIpmiBaseLib/PeiIpmiBaseLib.inf =20 [LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.UEFI_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf - - ##################################### - # IPMI Feature Package - ##################################### IpmiBaseLib|IpmiFeaturePkg/Library/IpmiBaseLib/IpmiBaseLib.inf =20 ##########################################################################= ###### @@ -149,18 +110,3 @@ IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf IpmiFeaturePkg/OsWdt/OsWdt.inf IpmiFeaturePkg/SolStatus/SolStatus.inf - -##########################################################################= ######################### -# -# 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] diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Post= Memory.fdf b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Post= Memory.fdf index 158b5455d8..e0f3bbe158 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMemory.= fdf +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMemory.= fdf @@ -7,11 +7,11 @@ # ## =20 - INF IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf - INF IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf - INF RuleOverride =3D DRIVER_ACPITABLE IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf - INF IpmiFeaturePkg/BmcElog/BmcElog.inf - INF IpmiFeaturePkg/Frb/FrbDxe.inf - INF IpmiFeaturePkg/IpmiFru/IpmiFru.inf - INF IpmiFeaturePkg/OsWdt/OsWdt.inf - INF IpmiFeaturePkg/SolStatus/SolStatus.inf +INF IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf +INF IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf +INF RuleOverride =3D DRIVER_ACPITABLE IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf +INF IpmiFeaturePkg/BmcElog/BmcElog.inf +INF IpmiFeaturePkg/Frb/FrbDxe.inf +INF IpmiFeaturePkg/IpmiFru/IpmiFru.inf +INF IpmiFeaturePkg/OsWdt/OsWdt.inf +INF IpmiFeaturePkg/SolStatus/SolStatus.inf diff --git a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeatureP= kg.dsc b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.d= sc index 6a3eed0882..c35e1e174e 100644 --- a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc +++ b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dsc @@ -25,6 +25,24 @@ PEI_ARCH =3D IA32 DXE_ARCH =3D X64 =20 +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + +[PcdsFeatureFlag] + # + # 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. # --=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 (#85589): https://edk2.groups.io/g/devel/message/85589 Mute This Topic: https://groups.io/mt/88365333/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- From nobody Mon Apr 29 00:08:26 2024 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+85590+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+85590+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954056; cv=none; d=zohomail.com; s=zohoarc; b=Ai28tgGoVfkUjn4bCDNHepshqxFHCMbI8WbjOLUV5TIw0YHgMc1ZNhdCeFktqyJxrAL47YJmvBHV094+0M/5egiUx8pJq8Jd0hfkiLkrd9JgVavmy7Oo2SN1iZocWfE036Uo5Zo5UH+H85+d/UxvgXO5ZVRSOX9R0zndmTXc5oU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954056; 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=+P2BzYH+OtjV1m9ACBFejtXyN9xGD2+o1Yo5gguOI0g=; b=EE31l8gxX7vPDG1Ww2DvVexq/RGrXIdo/o7io+Zlpa1+dOE3TUUyC3/Z+2qNEqETCTpn2PJ6/I7h3afESHxkaWcIdGuKrjCq+hmoAmkJYBhKnushbROUZOAWHkhg1DnSTjWAskAD62AqKPicqr3d7gZjK4gAR9Vf/cVRORUOp14= 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+85590+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 1641954056302817.950808313128; Tue, 11 Jan 2022 18:20:56 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id WzGWYY1788612xWJvCNoD1AA; Tue, 11 Jan 2022 18:20:56 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.18078.1641954050866873192 for ; Tue, 11 Jan 2022 18:20:51 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439820" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439820" 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:48 -0800 X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="528990294" 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:48 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Sai Chaganty , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 06/27] S3FeaturePkg: Fix all relative package paths Date: Tue, 11 Jan 2022 18:20:06 -0800 Message-Id: <29902af26459b43d30e4b70244e3742813113f1e.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: lWmVn0wjHya8bny9jILXeDRex1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954056; bh=lH4TxTpgM3v4kma44wi5lI3QBpcZtDXebLs0gZmSnYY=; h=Cc:Date:From:Reply-To:Subject:To; b=ik2NEnkQrNfEZOqd5YpX8uoh984vf2v+fIKM8+WqLFu+OfKxYC+NzlKXL8KlDq5FEF8 4XRLBn/J59bJu22nM9Fs4YfpZDZrrr+HIIMINc9KR5nP2D4PwMpcJ0bh0dvClngA4O9Nk QoV3b4qaif2cxoBzARKrZ4xOdkY1ruLq2Y4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954057637100024 Content-Type: text/plain; charset="utf-8" Packages should be at the root of a PACKAGES_PATH entry. At some point, paths were relative to edk2-platforms/Features/Intel which was functional, but interferes with the proper functioning of packaging tools. Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone Reviewed-by: Sai Chaganty --- Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf | 2 +- Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc | 2 +- Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.= fdf b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf index 3cd5cd9628..34caf3dacc 100644 --- a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf +++ b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf @@ -7,4 +7,4 @@ # ## =20 - INF PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf + INF S3FeaturePkg/S3Pei/S3Pei.inf diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.= dsc b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc index 312870981e..f94bd2b431 100644 --- a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc +++ b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc @@ -91,7 +91,7 @@ # in the package build. =20 # Add components here that should be included in the package build. - PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf + S3FeaturePkg/S3Pei/S3Pei.inf =20 # # Feature DXE Components diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf b/= Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf index 46fbb62a46..e485eac952 100644 --- a/Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf +++ b/Features/Intel/PowerManagement/S3FeaturePkg/S3Pei/S3Pei.inf @@ -23,7 +23,7 @@ [Packages] MdePkg/MdePkg.dec IntelSiliconPkg/IntelSiliconPkg.dec - PowerManagement/S3FeaturePkg/S3FeaturePkg.dec + S3FeaturePkg/S3FeaturePkg.dec =20 [Sources] S3Pei.c --=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 (#85590): https://edk2.groups.io/g/devel/message/85590 Mute This Topic: https://groups.io/mt/88365334/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- From nobody Mon Apr 29 00:08:26 2024 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+85591+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+85591+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954056; cv=none; d=zohomail.com; s=zohoarc; b=DSKnads2WRBsvLtnBjqVSevcVP6U8vhQOM8Bt2jGR9LmMP1x2fWExB0QYEz/4n9zxf9HpoD1WcdEVxAfB+QE/nXH8bEErMRr4kIACUNmFcUKF2ySbQr3CV3iSROgGYm6hUeJEMqR0ATmxVvCuVwD1zuyCmMy+FPGoUV2OeJgW+8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954056; 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=LEAHdpsNbNBd8k+uRqDI4CFLO5P7P3zeCbtDVPhLn6w=; b=Fg6tJuLWtLuiflKTKE3YSldJTeWG6mt96gZFZvIPbEAyN5+9sytMhU80zccgcWb2B18vHWccxKuxpCCiKMQAfdAPOvZMcjfLMAYQLIl3QCSZtrqB12x9ZCIGuqn3FpXohyEqxSOX/CtSIqHU5XDKCeuVzPe+jFbe0p6kKUdOPG0= 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+85591+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 1641954056981288.907593544973; Tue, 11 Jan 2022 18:20:56 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id z1s4YY1788612x3AohWYODj8; Tue, 11 Jan 2022 18:20:56 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.18083.1641954049814035968 for ; Tue, 11 Jan 2022 18:20:51 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439821" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439821" 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:48 -0800 X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="528990297" 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:48 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Sai Chaganty , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 07/27] S3FeaturePkg: Use MinPlatformPkg build include files Date: Tue, 11 Jan 2022 18:20:07 -0800 Message-Id: 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: F58ViVP9QzM1lq2YtY2C4IoWx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954056; bh=sWnwq8/MWTJi4guI577NGkFKZyVbKDNOWZ0gmIvH2K8=; h=Cc:Date:From:Reply-To:Subject:To; b=vthFBIdIHfX5JArnR4CbT5SDeSVTJEFPjwl4yGhhGS938sB9y1/+FHv8aXHCvr4r9sN V2vXNJnMvJX0BGwZGEKqluHmBrbu4+wEVgfDM+zzceopwy/ebm+5EutlsIzXIQTK/bZSp E57dKYhmMljwAaMMobijiCxNovyHZY+axzM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954057789100032 Content-Type: text/plain; charset="utf-8" Use the MinPlatformPkg common core build files to build libraries needed by this feature. Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone Reviewed-by: Sai Chaganty --- Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf | 2 +- Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc | 72 ++-= ----------------- Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc | 18 +++= ++ 3 files changed, 26 insertions(+), 66 deletions(-) diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.= fdf b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf index 34caf3dacc..fdd16a4e03 100644 --- a/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf +++ b/Features/Intel/PowerManagement/S3FeaturePkg/Include/PreMemory.fdf @@ -7,4 +7,4 @@ # ## =20 - INF S3FeaturePkg/S3Pei/S3Pei.inf +INF S3FeaturePkg/S3Pei/S3Pei.inf diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.= dsc b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc index f94bd2b431..cc34e78507 100644 --- a/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc +++ b/Features/Intel/PowerManagement/S3FeaturePkg/Include/S3Feature.dsc @@ -18,12 +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 + !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 ##########################################################################= ###### # @@ -31,34 +31,7 @@ # ##########################################################################= ###### =20 -!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 - IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf - PciCf8Lib|MdePkg/Library/BasePciCf8Lib/BasePciCf8Lib.inf - PciLib|MdePkg/Library/BasePciLibCf8/BasePciLibCf8.inf - PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.i= nf - -[LibraryClasses.common.PEI_CORE,LibraryClasses.common.PEIM] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf - MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf - PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf - PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf - - ####################################### - # Silicon Initialization Package - ####################################### +[LibraryClasses.common.PEIM] SmmAccessLib|IntelSiliconPkg/Feature/SmmAccess/Library/PeiSmmAccessLib/P= eiSmmAccessLib.inf =20 ##########################################################################= ###### @@ -92,34 +65,3 @@ =20 # Add components here that should be included in the package build. S3FeaturePkg/S3Pei/S3Pei.inf - -# -# Feature DXE Components -# - -# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 -# is completed. -[Components.X64] - ##################################### - # S3 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. - -##########################################################################= ######################### -# -# 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] diff --git a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc b= /Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc index 28ee49d429..e16a1f8d00 100644 --- a/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc +++ b/Features/Intel/PowerManagement/S3FeaturePkg/S3FeaturePkg.dsc @@ -24,6 +24,24 @@ PEI_ARCH =3D IA32 DXE_ARCH =3D X64 =20 +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + +[PcdsFeatureFlag] + # + # 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. # --=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 (#85591): https://edk2.groups.io/g/devel/message/85591 Mute This Topic: https://groups.io/mt/88365335/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- From nobody Mon Apr 29 00:08:26 2024 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+85592+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+85592+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954057; cv=none; d=zohomail.com; s=zohoarc; b=CVH/Zagogf0OGIQ2KA8e6lJ2uUTeh8r7C0QBu8orFmCY5ajvUaieyVRvZGVk7b80++sL4HzvAKt+A0ug+ky/EEnmnJJIi4XBU0Aekyh492n/FgvJuHtpFgOPgXKNzfzLNtF1ZlWDAwGOvmYNrFKfZdSwvJEUh0iZcX1kD6P64c8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954057; 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=o8MSggBlFdGqHLLCWgffidScVcpVYuG6ABpWnsGLmo0=; b=cFtlh7N9gy7CYFFbEvgEm4yECh6KqbRt6hh7jm4oSHH4EcyA6sJM1JMgF8MgUtqw/Y6NXhNFzHVYolmWOO6dMymjYXv9ZtdPaEvuVgaMrTAQ7yENtPaZ2bPwb0ovNOTqtE+q1gPZ3+sI7gubNo5YnzkYAzq7Ey2KLFcwrYRJ/BE= 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+85592+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 1641954057746324.42775620598866; Tue, 11 Jan 2022 18:20:57 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id uQ4SYY1788612x03UTD5p8sz; Tue, 11 Jan 2022 18:20:57 -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:51 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439822" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439822" 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:48 -0800 X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="528990301" 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:48 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Sai Chaganty , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 08/27] SmbiosFeaturePkg: Fix all relative package paths Date: Tue, 11 Jan 2022 18:20:08 -0800 Message-Id: <1700c9d7adc92511d2bc2bd74c7142e2d129a298.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: nI230kej9lfXELOktc7q5laZx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954057; bh=QRJIkBNOfvrUSJ1RUQek34iEdIMedmzlCxN9a5oPe78=; h=Cc:Date:From:Reply-To:Subject:To; b=vVWgGUY6B3+2TIb/9wzAUZg0itqxiaBVefTfNu3ZelauAlcXhESuhZLY4zoauNiHRHH SNmhNfDoJgYDpNpAsKihOpMFk5+Di5+oLya0lU1U8zBOC+ad0ozPVZ2h0e5tP8RyQGHJm mkN5GofAYxDsdVcmNI6lC7gAe7t3cvq+FwY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954059951100002 Content-Type: text/plain; charset="utf-8" Packages should be at the root of a PACKAGES_PATH entry. At some point, paths were relative to edk2-platforms/Features/Intel which was functional, but interferes with the proper functioning of packaging tools. Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone Reviewed-by: Sai Chaganty --- Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/PostMemory.fdf = | 2 +- Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeature.ds= c | 2 +- Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBas= icDxe.inf | 2 +- Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec = | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/Post= Memory.fdf b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/Post= Memory.fdf index 3ed23bd937..c3a3e81503 100644 --- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/PostMemory.= fdf +++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/PostMemory.= fdf @@ -7,4 +7,4 @@ # ## =20 - INF SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf + INF SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/Smbi= osFeature.dsc b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/S= mbiosFeature.dsc index 31d44b68b3..094dd957b8 100644 --- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeatu= re.dsc +++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeatu= re.dsc @@ -100,7 +100,7 @@ # in the package build. =20 # Add components here that should be included in the package build. - SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf + SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf =20 ##########################################################################= ######################### # diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosBasicD= xe/SmbiosBasicDxe.inf b/Features/Intel/SystemInformation/SmbiosFeaturePkg/S= mbiosBasicDxe/SmbiosBasicDxe.inf index bd8736b621..8e530c4945 100644 --- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/Smbi= osBasicDxe.inf +++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosBasicDxe/Smbi= osBasicDxe.inf @@ -33,7 +33,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec + SmbiosFeaturePkg/SmbiosFeaturePkg.dec =20 [LibraryClasses] BaseLib diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeatur= ePkg.dec b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeatureP= kg.dec index 6170f37969..db3cdbb0d0 100644 --- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec +++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec @@ -38,7 +38,7 @@ IndustryStandard/SmBios.h MdePkg/MdePkg.dec - SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec + SmbiosFeaturePkg/SmbiosFeaturePkg.dec } gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType0BiosInformation.Vendor|0x1 gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType0BiosInformation.BiosVersio= n|0x2 @@ -71,7 +71,7 @@ IndustryStandard/SmBios.h MdePkg/MdePkg.dec - SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec + SmbiosFeaturePkg/SmbiosFeaturePkg.dec } gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType1SystemInformation.Manufact= urer|0x1 gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType1SystemInformation.ProductN= ame|0x2 @@ -87,7 +87,7 @@ IndustryStandard/SmBios.h MdePkg/MdePkg.dec - SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec + SmbiosFeaturePkg/SmbiosFeaturePkg.dec } =20 # @@ -111,7 +111,7 @@ IndustryStandard/SmBios.h MdePkg/MdePkg.dec - SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec + SmbiosFeaturePkg/SmbiosFeaturePkg.dec } gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType3SystemEnclosureChassis.Man= ufacturer|0x1 gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType3SystemEnclosureChassis.Typ= e|MiscChassisTypeRackMountChassis @@ -131,7 +131,7 @@ IndustryStandard/SmBios.h MdePkg/MdePkg.dec - SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec + SmbiosFeaturePkg/SmbiosFeaturePkg.dec } gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosType32SystemBootInformation.Boo= tStatus|BootInformationStatusNoError =20 --=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 (#85592): https://edk2.groups.io/g/devel/message/85592 Mute This Topic: https://groups.io/mt/88365336/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- From nobody Mon Apr 29 00:08:26 2024 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+85594+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+85594+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954059; cv=none; d=zohomail.com; s=zohoarc; b=ZhUcoPl/k3yBH25KEDE+PZ4R2ttsVnuxVYw6073P1PQ9Bwif9nwNM91liv6Pvv7yjeO7bvyhZqPP+J73SpJ+oow4Ln8u+ZQLM0RsQPrZNWV2CDrgtcmlwJB26JlAZYrvX0Eyv3lC5+yZHQ3xKtemj6PXZkaQv1rSgORfSGzwF9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954059; 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=a1l8spo9kV0vx84LGmEn83W7Vv8noKQ/xoQleCzWCkY=; b=P6FXbZC38MMfZxk1J3yiEC/C5B6Wt8IRV/edYoPJJvnuuhG9zgPx58XTcLSDTuUwAw7PfVi56iRTw69Kgf3/Vv+k3R32vKoM4F0zSM/dCJ9nyc/gKJxeXZpsvR2D3zjbnBONzzTbaVT8v3FN89E3uCqr364XV28+B7udkQk1zGY= 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+85594+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 1641954059588824.9663029671099; Tue, 11 Jan 2022 18:20:59 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 0VDiYY1788612xysTCiPfeAN; Tue, 11 Jan 2022 18:20:59 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.18078.1641954050866873192 for ; Tue, 11 Jan 2022 18:20:51 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439824" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439824" 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="528990303" 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:48 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Isaac Oram , Sai Chaganty , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 09/27] SmbiosFeaturePkg: Use MinPlatformPkg build include files Date: Tue, 11 Jan 2022 18:20:09 -0800 Message-Id: <0a6aa830baf91ceb56dbd686080ac6f1406b5b24.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: AAVg00AbirFAvr7LogItsp9bx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954059; bh=agXWmOCUMld4SIYQ+GN+Js1ognTHJZx/u2dGhtXrDS8=; h=Cc:Date:From:Reply-To:Subject:To; b=ffo5hlaf5AhilY8cf5O0uuVTBu5+KzHZZ85PiWCFJsF/1SJ+AmE1ZMU5mzi6mRrkc06 4hjDUE4nt2AjtxBibSpMmQUxUGqVbJGuWkSq2cE63Um4k+Q10Ie0YBiWucyQhVUhS+Gdf SdMGNlbOIFsUy7bgYeHsahMUtFlehKMuFGg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954059970100005 Content-Type: text/plain; charset="utf-8" Use the MinPlatformPkg common core build files to build libraries needed by this feature. Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/PostMemory.fdf = | 2 +- Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeature.ds= c | 52 -------------------- Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dsc = | 18 +++++++ 3 files changed, 19 insertions(+), 53 deletions(-) diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/Post= Memory.fdf b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/Post= Memory.fdf index c3a3e81503..d46bacfbd2 100644 --- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/PostMemory.= fdf +++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/PostMemory.= fdf @@ -7,4 +7,4 @@ # ## =20 - INF SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf +INF SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/Smbi= osFeature.dsc b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/S= mbiosFeature.dsc index 094dd957b8..7a165f39d7 100644 --- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeatu= re.dsc +++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeatu= re.dsc @@ -33,28 +33,6 @@ =20 !include MdePkg/MdeLibs.dsc.inc =20 -[LibraryClasses] - ####################################### - # Edk2 Packages - ####################################### - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf - -[LibraryClasses.common.DXE_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf - ##########################################################################= ###### # # Component section - list of all components that need built for this feat= ure. @@ -69,21 +47,6 @@ # generated for it, but the binary will not be put into any firmware= volume. # ##########################################################################= ###### -# -# Feature PEI Components -# - -# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 -# is completed. -[Components.IA32] - ##################################### - # SMBIOS 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. =20 # # Feature DXE Components @@ -101,18 +64,3 @@ =20 # Add components here that should be included in the package build. SmbiosFeaturePkg/SmbiosBasicDxe/SmbiosBasicDxe.inf - -##########################################################################= ######################### -# -# 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] diff --git a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeatur= ePkg.dsc b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeatureP= kg.dsc index 31141c0725..e72b341154 100644 --- a/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dsc +++ b/Features/Intel/SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dsc @@ -24,6 +24,24 @@ PEI_ARCH =3D IA32 DXE_ARCH =3D X64 =20 +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + +[PcdsFeatureFlag] + # + # 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. # --=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 (#85594): https://edk2.groups.io/g/devel/message/85594 Mute This Topic: https://groups.io/mt/88365338/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- From nobody Mon Apr 29 00:08:26 2024 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+85593+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+85593+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954059; cv=none; d=zohomail.com; s=zohoarc; b=eJ9QlTAUMgQ1i33H/ptEFkeQzNjgXilx7DpTLjc94q137qImqU1dUyfsaGthR9zfloafOLunseLzRt15Tj8djSqyOWdXjlhwmsvTuLIqUuEGXdM8UCZLtpVZM1pWy7gnURPF3RBay38DbsotvtIS4FumcZgp6MILb++I9lMZ64o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954059; 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=KHVAOhb6hZ/O2ErZY5TyB/UIhIDC+VziEs9QpivULDg=; b=D1MONLayDs2SCj0QH7Ofjwx/Devq3J+k8eBQdAR50loOXUBmQi+6FzlJAgx3wg4+g4lpkyMVN1EcICZN6MNjAsvEmWBdgoXujjNf1PUYXtdYqiIUkYdoJrLOzmXzlE9FY7aCOupmvDNcyy+mLeTWAJ8WJaYCBsg3PWbjeDNWZQs= 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+85593+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 1641954059101175.79935022583595; Tue, 11 Jan 2022 18:20:59 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id SlXgYY1788612xxy3H2Tkq03; Tue, 11 Jan 2022 18:20:58 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.18083.1641954049814035968 for ; Tue, 11 Jan 2022 18:20:51 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439825" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439825" 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="528990306" 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 , Liming Gao , Dandan Bi Subject: [edk2-devel][edk2-platforms][PATCH V1 10/27] UserAuthFeaturePkg: Fix all relative package paths Date: Tue, 11 Jan 2022 18:20:10 -0800 Message-Id: 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: pjjV0HkId0tO2rTJ4GayXcpjx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954058; bh=z9vO6WnR/Z7uMAuN+GqM7GsY4ODKRzLBx2febHQYl48=; h=Cc:Date:From:Reply-To:Subject:To; b=a673fHj5/kV7upGMw8Sy3th6H0wSQiAuzX8ODR/I/W2ouXMTmZfnp4DBPHlfpZd2DRG e81cuC6afpg+Kgx+47C8DWA5uFkNFV5byvpLP2NCFiJFph0kyJBpA1l0Wk9hCEpnA5uzD mB9YH5pMKCsQkH3qsTNgAbvkH3GFgiIRUhA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954059975100007 Content-Type: text/plain; charset="utf-8" Packages should be at the root of a PACKAGES_PATH entry. At some point, paths were relative to edk2-platforms/Features/Intel which was functional, but interferes with the proper functioning of packaging tools. Cc: Liming Gao Cc: Dandan Bi Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fdf = | 6 +++--- Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.ds= c | 12 ++++++------ Features/Intel/UserInterface/UserAuthFeaturePkg/Library/PlatformPasswordLi= bNull/PlatformPasswordLibNull.inf | 2 +- Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPasswordLib/Us= erPasswordLib.inf | 2 +- Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPasswordUiLib/= UserPasswordUiLib.inf | 2 +- Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/U= serAuthentication2Dxe.inf | 2 +- Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/U= serAuthenticationDxe.inf | 2 +- Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/U= serAuthenticationSmm.inf | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMe= mory.fdf b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemo= ry.fdf index f0b33aa44c..c534bebcc0 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fdf +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fdf @@ -7,6 +7,6 @@ # ## =20 - INF UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthen= ticationDxe.inf - INF UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthen= tication2Dxe.inf - INF UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthen= ticationSmm.inf + INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.inf + INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe.i= nf + INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAu= thFeature.dsc b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/Use= rAuthFeature.dsc index d4f7a5ed23..7eeaf441c1 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeatu= re.dsc +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeatu= re.dsc @@ -58,8 +58,8 @@ ##################################### # User Authentication Feature Package ##################################### - PlatformPasswordLib|UserInterface/UserAuthFeaturePkg/Library/PlatformPas= swordLibNull/PlatformPasswordLibNull.inf - UserPasswordLib|UserInterface/UserAuthFeaturePkg/Library/UserPasswordLib= /UserPasswordLib.inf + PlatformPasswordLib|UserAuthFeaturePkg/Library/PlatformPasswordLibNull/P= latformPasswordLibNull.inf + UserPasswordLib|UserAuthFeaturePkg/Library/UserPasswordLib/UserPasswordL= ib.inf =20 [LibraryClasses.common.DXE_DRIVER] ####################################### @@ -122,12 +122,12 @@ =20 # Add library instances here that are not included in package components= and should be tested # in the package build. - UserInterface/UserAuthFeaturePkg/Library/UserPasswordUiLib/UserPasswordU= iLib.inf + UserAuthFeaturePkg/Library/UserPasswordUiLib/UserPasswordUiLib.inf =20 # Add components here that should be included in the package build. - UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentica= tionDxe.inf - UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentica= tion2Dxe.inf - UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentica= tionSmm.inf + UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.inf + UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe.inf + UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf =20 ##########################################################################= ######################### # diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/Platfo= rmPasswordLibNull/PlatformPasswordLibNull.inf b/Features/Intel/UserInterfac= e/UserAuthFeaturePkg/Library/PlatformPasswordLibNull/PlatformPasswordLibNul= l.inf index 00be14df8a..278fe026a6 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/PlatformPassw= ordLibNull/PlatformPasswordLibNull.inf +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/PlatformPassw= ordLibNull/PlatformPasswordLibNull.inf @@ -32,7 +32,7 @@ =20 [Packages] MdePkg/MdePkg.dec - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec + UserAuthFeaturePkg/UserAuthFeaturePkg.dec =20 [Pcd] gUserAuthFeaturePkgTokenSpaceGuid.PcdPasswordCleared ## CONSUMES diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPa= sswordLib/UserPasswordLib.inf b/Features/Intel/UserInterface/UserAuthFeatur= ePkg/Library/UserPasswordLib/UserPasswordLib.inf index 99d84ae637..a3124aa443 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPasswordL= ib/UserPasswordLib.inf +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPasswordL= ib/UserPasswordLib.inf @@ -21,7 +21,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec + UserAuthFeaturePkg/UserAuthFeaturePkg.dec =20 [LibraryClasses] UefiBootServicesTableLib diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPa= sswordUiLib/UserPasswordUiLib.inf b/Features/Intel/UserInterface/UserAuthFe= aturePkg/Library/UserPasswordUiLib/UserPasswordUiLib.inf index 9ab7d83319..8f6a693d76 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPasswordU= iLib/UserPasswordUiLib.inf +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPasswordU= iLib/UserPasswordUiLib.inf @@ -20,7 +20,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec + UserAuthFeaturePkg/UserAuthFeaturePkg.dec =20 [LibraryClasses] UefiBootServicesTableLib diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthentica= tionDxeSmm/UserAuthentication2Dxe.inf b/Features/Intel/UserInterface/UserAu= thFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe.inf index 2c6c3661fb..c47e20f052 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxe= Smm/UserAuthentication2Dxe.inf +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxe= Smm/UserAuthentication2Dxe.inf @@ -26,7 +26,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec + UserAuthFeaturePkg/UserAuthFeaturePkg.dec =20 [LibraryClasses] BaseLib diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthentica= tionDxeSmm/UserAuthenticationDxe.inf b/Features/Intel/UserInterface/UserAut= hFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.inf index 58066b588c..bee46a1af2 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxe= Smm/UserAuthenticationDxe.inf +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxe= Smm/UserAuthenticationDxe.inf @@ -28,7 +28,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec + UserAuthFeaturePkg/UserAuthFeaturePkg.dec =20 [LibraryClasses] BaseLib diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthentica= tionDxeSmm/UserAuthenticationSmm.inf b/Features/Intel/UserInterface/UserAut= hFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf index 891e2b981d..b53f70f0e3 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxe= Smm/UserAuthenticationSmm.inf +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxe= Smm/UserAuthenticationSmm.inf @@ -27,7 +27,7 @@ MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec CryptoPkg/CryptoPkg.dec - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec + UserAuthFeaturePkg/UserAuthFeaturePkg.dec =20 [LibraryClasses] UefiBootServicesTableLib --=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 (#85593): https://edk2.groups.io/g/devel/message/85593 Mute This Topic: https://groups.io/mt/88365337/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- From nobody Mon Apr 29 00:08:26 2024 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+85595+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+85595+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954060; cv=none; d=zohomail.com; s=zohoarc; b=HSpkrYw07peH2nZhzhqiSbgk8VqlViNEe1u3RNXrKW1+oM2jg72E6Ypf7TTZDREXCN5tsOhVFa06v63znFq9uGSnKJ3KocJw3oTDCyBkAYto+J3EjV1adeqf0DsmAFb4JMrkMkoNDg1x3a+IbOafDMt1KFitJCuz5fuC++hjZ1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954060; 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=AysUfUC0U2GCdwWjAnXq8OTtrm69iXMTGa2yASkh9MQ=; b=kSOgnRYnxN2J4bgrm9w17cAHTaVzz68TOoKQEv/vrLVBF+AJm5flsZdCoQmRvzMNnHtvO7ljzAVJeFzJPKMIoRb3Q3pkB8KxXEIHdvq3iuV56nBny1bT2MAWHDaE0z1sNLO92eDcByh27snIB6XjZNl/UkT23KTUJBIxXLE6nVc= 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+85595+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 1641954060082787.7576737022904; Tue, 11 Jan 2022 18:21:00 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Fw8UYY1788612xjv8k6t2Que; Tue, 11 Jan 2022 18:20:59 -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:51 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439826" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439826" 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="528990310" 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 11/27] UserAuthFeaturePkg: Use MinPlatformPkg build include files Date: Tue, 11 Jan 2022 18:20:11 -0800 Message-Id: <3bf03e7f65bc6eed53a0a7d89a8780087f03a937.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: v9sjK8w0Kf4hD51Jf4koSvYIx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954059; bh=/je1GDPx71ZIhgn+PioHMBIZUcgm0crqZARf/VRIQrE=; h=Cc:Date:From:Reply-To:Subject:To; b=dswC2nsnUtbhsCGMWCbSBL5a586CmUj5z3ArI2hwfrJ+SjAVesN/03oaFcdzYRWmvod kOuntIYS/TXBJy5ChZWd6jtCZt/uvGV027lW0N/5sSocZ6ODlNFPJAP/zjSVj3CuhJFpE sjHNpI0+LgJu8Jr9+IrIp1gGaibYvCEgLE8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954061972100017 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/UserAuthFeaturePkg/Include/PostMemory.fdf = | 6 +- Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.ds= c | 80 ++------------------ Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dsc = | 18 +++++ 3 files changed, 27 insertions(+), 77 deletions(-) diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMe= mory.fdf b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemo= ry.fdf index c534bebcc0..030dcbe763 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fdf +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fdf @@ -7,6 +7,6 @@ # ## =20 - INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.inf - INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe.i= nf - INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf +INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.inf +INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe.inf +INF UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAu= thFeature.dsc b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/Use= rAuthFeature.dsc index 7eeaf441c1..2f39a5580c 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeatu= re.dsc +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeatu= re.dsc @@ -18,12 +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 + !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 ##########################################################################= ###### # @@ -34,47 +34,9 @@ !include MdePkg/MdeLibs.dsc.inc =20 [LibraryClasses] - ####################################### - # Edk2 Packages - ####################################### - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplat= e.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf - UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServic= esLib.inf - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf - RngLib|MdePkg/Library/BaseRngLib/BaseRngLib.inf - - ##################################### - # User Authentication Feature Package - ##################################### PlatformPasswordLib|UserAuthFeaturePkg/Library/PlatformPasswordLibNull/P= latformPasswordLibNull.inf UserPasswordLib|UserAuthFeaturePkg/Library/UserPasswordLib/UserPasswordL= ib.inf =20 -[LibraryClasses.common.DXE_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - -[LibraryClasses.common.DXE_SMM_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf - MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAlloc= ationLib.inf - SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableL= ib.inf - ##########################################################################= ######################### # # Components Section - list of the modules and components that will be pro= cessed by compilation @@ -93,21 +55,6 @@ # generated for it, but the binary will not be put into any firmware= volume. # ##########################################################################= ######################### -# -# Feature PEI Components -# - -# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 -# is completed. -[Components.IA32] - ##################################### - # User Authentication 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. =20 # # Feature DXE Components @@ -128,18 +75,3 @@ UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.inf UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe.inf UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm.inf - -##########################################################################= ######################### -# -# 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] diff --git a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeatur= ePkg.dsc b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeatureP= kg.dsc index 74eb9213ce..10360c5737 100644 --- a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dsc +++ b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dsc @@ -24,6 +24,24 @@ PEI_ARCH =3D IA32 DXE_ARCH =3D X64 =20 +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + +[PcdsFeatureFlag] + # + # 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. # --=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 (#85595): https://edk2.groups.io/g/devel/message/85595 Mute This Topic: https://groups.io/mt/88365339/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- From nobody Mon Apr 29 00:08:26 2024 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+85598+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+85598+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954062; cv=none; d=zohomail.com; s=zohoarc; b=hPTw2n1U3SzjXUPLj3ufOgTFwScR8x6WU8xt+hZlLAeBxSsxnb1NsDfiV+vlrAgw2QgIEFprRCNemcLFE/Da6elnhiahxKTZtbBLDDM4BRD20UFJqA2k6KOEYaxKoXqD/UWgJKjKS7FhIRgJlhSEF5Vsn6Vs9wyVNqXRGwfO4lI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954062; 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=g+IE6xLjqh5LCFC0dDpTyMME8OQu+LbnBEuPI53sKTw=; b=j/g2MjUUkj8CWnW0TVlFT009QGXtUAXtX1e4I6pQRyeX8GfaTVmijM1fp5mfIEVugnj5Em0ZxgSJQxV8wrfwou5NnFDKKxLKKyGbwcDX/aKfIqwR1BxtW55r9tGALuBcqUTgfugNSBTWoT2a+9YUfn4tfdfGxVGj34Bw37Do9bk= 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+85598+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 1641954062143931.8534748565143; Tue, 11 Jan 2022 18:21:02 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id UJZAYY1788612xrpsyu9oOjs; Tue, 11 Jan 2022 18:21:01 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.18083.1641954049814035968 for ; Tue, 11 Jan 2022 18:20:52 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439827" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439827" 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="528990314" 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 , Liming Gao , Dandan Bi Subject: [edk2-devel][edk2-platforms][PATCH V1 12/27] VirtualKeyboardFeaturePkg: Fix all relative package paths Date: Tue, 11 Jan 2022 18:20:12 -0800 Message-Id: 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: 1ODHkCdk9ZwNy8IruZR6isoax1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954061; bh=76lrz5FhHKb1c7o7lQfKNUZxHVIvDB1GldECV8zQnWs=; h=Cc:Date:From:Reply-To:Subject:To; b=vJBlGfeD0Mp1fy5cNt+BtAzwlXBgeIKGLdBhCYUzhqHYo2n8/F+ArnWZW2QCwx813Cr hwEQjxvQ3BSMsljiYT5NVdsXsnyjfJBNVHwt7qwALJIYn15Hkt2haMuJCoFI9kpx+BgWJ gJxbNOblylLoeCMl6BDXuGXO5xxZJ6aChSY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954064067100029 Content-Type: text/plain; charset="utf-8" Packages should be at the root of a PACKAGES_PATH entry. At some point, paths were relative to edk2-platforms/Features/Intel which was functional, but interferes with the proper functioning of packaging tools. Cc: Liming Gao Cc: Dandan Bi Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/PostMemory.= fdf | 2 +- Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/VirtualKeyb= oardFeature.dsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include= /PostMemory.fdf b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/In= clude/PostMemory.fdf index bf4a4d5078..f40b5087e8 100644 --- a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/PostMe= mory.fdf +++ b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/PostMe= mory.fdf @@ -7,4 +7,4 @@ # ## =20 - INF UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardDxe/VirtualKe= yboardDxe.inf + INF VirtualKeyboardFeaturePkg/VirtualKeyboardDxe/VirtualKeyboardDxe.inf diff --git a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include= /VirtualKeyboardFeature.dsc b/Features/Intel/UserInterface/VirtualKeyboardF= eaturePkg/Include/VirtualKeyboardFeature.dsc index a8c3819480..8179f70c80 100644 --- a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/Virtua= lKeyboardFeature.dsc +++ b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/Virtua= lKeyboardFeature.dsc @@ -81,7 +81,7 @@ ##################################### # Virtual Keyboard Feature Package ##################################### - UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardDxe/VirtualKeyboa= rdDxe.inf + VirtualKeyboardFeaturePkg/VirtualKeyboardDxe/VirtualKeyboardDxe.inf =20 ##########################################################################= ######################### # --=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 (#85598): https://edk2.groups.io/g/devel/message/85598 Mute This Topic: https://groups.io/mt/88365342/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- From nobody Mon Apr 29 00:08:26 2024 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+85596+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+85596+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954061; cv=none; d=zohomail.com; s=zohoarc; b=M6ScFDHcJhPsKX5oAT7wf1CvKlA8bejYPDEb4TRrHzYlk0Dbts4wJQ++sGZHoapHi8MXqepFIAfoD6NpA7u5rnWX4tDKc9CUFoBAvp1W+RpJWZTiDoiQGohMvhazDt1i3uVQP7ml4fnjzbNytd769SCVyU5Uf/mVjU248hKrJkM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954061; 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=UgXHGTvMVo73t0dKq1FYC2SnEzSBQB+Lt1bjqdm+pMo=; b=h4UGVKGFSUJxYDGrgdmzj7V/Z/TgxqgVcmXYC5Nryf7ibaAqtHfIXOt9thsdbzRemlbSBq7diCM3XDbh1jBBaGmeN6qdBgIueog3WhBKjqA+7kj9N0tSj9RGTmPQVXiCeGJ97IqT+jU/pdpyXLypTY2cfKqF0DHFR2+gl6Bkvv4= 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+85596+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 1641954061122272.0520439559855; Tue, 11 Jan 2022 18:21:01 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id LeMuYY1788612xGWYgKC9K0P; Tue, 11 Jan 2022 18:21:00 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.18078.1641954050866873192 for ; Tue, 11 Jan 2022 18:20:51 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439828" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439828" 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="528990317" 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 13/27] VirtualKeyboardFeaturePkg: Use MinPlatformPkg build include files Date: Tue, 11 Jan 2022 18:20:13 -0800 Message-Id: <6f4fd8cd087394fbe9b7a0ba101a5a9eb9e578ab.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: TghOUZrGTnjCwcgjfUA7k4Jsx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954060; bh=Dh40jTxXZrXX3ZOmEMhUkrDekfpu4d1utffdI4CTaX4=; h=Cc:Date:From:Reply-To:Subject:To; b=vQEQ9nEHAOE09cx4FHWdCn3CHAZRTTDAOFXHE2ErVu+COR+Ucw3sIOPtpHTzZApfcPr AFQfTVh5cTz+NsYQwOufi45qGjvWgYCTxeRMr75dt6GStj4LPVIVkV6Eu+HPvbBIyEQme zOyB/5P7ywXorwYOF8htNx6tuYiwcxRddoI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954062024100021 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/VirtualKeyboardFeaturePkg/Include/VirtualKeyb= oardFeature.dsc | 62 +++----------------- Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeat= urePkg.dsc | 18 ++++++ 2 files changed, 25 insertions(+), 55 deletions(-) diff --git a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include= /VirtualKeyboardFeature.dsc b/Features/Intel/UserInterface/VirtualKeyboardF= eaturePkg/Include/VirtualKeyboardFeature.dsc index 8179f70c80..0d4f14a412 100644 --- a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/Virtua= lKeyboardFeature.dsc +++ b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/Virtua= lKeyboardFeature.dsc @@ -18,43 +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/BaseMemoryLib/BaseMemoryLib.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServic= esLib.inf - UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf - -[LibraryClasses.common.UEFI_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.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 ##########################################################################= ######################### # @@ -74,26 +43,9 @@ # generated for it, but the binary will not be put into any firmware= volume. # ##########################################################################= ######################### + # # Feature DXE Components # [Components.X64] - ##################################### - # Virtual Keyboard Feature Package - ##################################### VirtualKeyboardFeaturePkg/VirtualKeyboardDxe/VirtualKeyboardDxe.inf - -##########################################################################= ######################### -# -# 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] diff --git a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Virtual= KeyboardFeaturePkg.dsc b/Features/Intel/UserInterface/VirtualKeyboardFeatur= ePkg/VirtualKeyboardFeaturePkg.dsc index ea2005c6d2..6717c892f1 100644 --- a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboar= dFeaturePkg.dsc +++ b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboar= dFeaturePkg.dsc @@ -24,6 +24,24 @@ PEI_ARCH =3D IA32 DXE_ARCH =3D X64 =20 +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + +[PcdsFeatureFlag] + # + # 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. # --=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 (#85596): https://edk2.groups.io/g/devel/message/85596 Mute This Topic: https://groups.io/mt/88365340/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- From nobody Mon Apr 29 00:08:26 2024 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+85597+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+85597+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954061; cv=none; d=zohomail.com; s=zohoarc; b=QVZ3v/ceE4KcY6PE09bPi01GbpEFI/KV9sUET5Fvc5OGtrQTn9G/LWZ62f9aZu8kv1KAALren7Jzlr0klpGplXyoDLhGE5FqQhbO9RNduxhQFVnPIgwHzSSITO+6UxaUfkrqE83D5nIvzSXA6NgbzOrkBiER1EJnMhxjU++ulnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954061; 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=ZR18+C5+/1w6N6N2gGFAVqxlNLxujDQxlp529vTQl3s=; b=IBrGDQ2jPPOPnMIzyhiwPa46s+bRt2j11NRBrk6f8nhwI2g3+Fj7rUYj10asA9c/MiJJgfa/4WRU5L+pQyFPNMWmzZtCGWgR8a7BKsoy6sEJNdo6W0I+TPD2fAOD6pW3KkkikmpHV2oDBOMvQmLLUx88TCvl706DenF22EJFkiM= 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+85597+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 1641954061643364.71884923801315; Tue, 11 Jan 2022 18:21:01 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id tgYvYY1788612xIG9TSPqIsA; Tue, 11 Jan 2022 18:21:01 -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="243439829" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439829" 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="528990320" 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 , Liming Gao , Dandan Bi Subject: [edk2-devel][edk2-platforms][PATCH V1 14/27] VirtualKeyboardFeaturePkg: Add feature enable PCD Date: Tue, 11 Jan 2022 18:20:14 -0800 Message-Id: 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: trZG2vd5x0CWwh3VrSe6sLcox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954061; bh=Rk3oPy1u5GMp4NlvLnlyIK8NYkE1BYMY0mVDK3v7NQI=; h=Cc:Date:From:Reply-To:Subject:To; b=l9zdDBFdOtM6MR4kR8aJdip8ydHmcJ94SNi+sk8aHfT4clD03J9E2lwB9LMQwZCBaAi APKtorElLGkLSWcVoLIi9HQo/BQOJMzLfBhGyPPVMGGjwrHk4YZVCA1bQDrWqiscwPLr1 I5E+KUPrXgiCfVVwy6ANPzVccK5U7NlsMhw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954062022100020 Content-Type: text/plain; charset="utf-8" VirtualKeyboard missing feature enable PCD. Cc: Liming Gao Cc: Dandan Bi Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/PostMemory.= fdf | 2 +- Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboardFeat= urePkg.dec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include= /PostMemory.fdf b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/In= clude/PostMemory.fdf index f40b5087e8..31a9a6c35d 100644 --- a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/PostMe= mory.fdf +++ b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Include/PostMe= mory.fdf @@ -7,4 +7,4 @@ # ## =20 - INF VirtualKeyboardFeaturePkg/VirtualKeyboardDxe/VirtualKeyboardDxe.inf +INF VirtualKeyboardFeaturePkg/VirtualKeyboardDxe/VirtualKeyboardDxe.inf diff --git a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/Virtual= KeyboardFeaturePkg.dec b/Features/Intel/UserInterface/VirtualKeyboardFeatur= ePkg/VirtualKeyboardFeaturePkg.dec index c26db01f09..d4b5d67783 100644 --- a/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboar= dFeaturePkg.dec +++ b/Features/Intel/UserInterface/VirtualKeyboardFeaturePkg/VirtualKeyboar= dFeaturePkg.dec @@ -22,5 +22,10 @@ Include =20 [Guids] + gVirtualKeyboardFeaturePkgTokenSpaceGuid =3D { 0x7a9af74f, 0x27ca= , 0x4834, { 0xa7, 0xd4, 0x62, 0x63, 0xf0, 0xe5, 0x7a, 0xd0 } } + ## GUID used for VirtualKeyboardDriver to open TouchPanel protocol. - gEdkiiTouchPanelGuid =3D { 0x91b1d27b, 0xe12= 6, 0x48d1, { 0x82, 0x34, 0xd2, 0x8b, 0x81, 0xc8, 0x83, 0x62 }} + gEdkiiTouchPanelGuid =3D { 0x91b1d27b, 0xe126= , 0x48d1, { 0x82, 0x34, 0xd2, 0x8b, 0x81, 0xc8, 0x83, 0x62 }} + +[PcdsFeatureFlag] + gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable= |FALSE|BOOLEAN|0x00000001 --=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 (#85597): https://edk2.groups.io/g/devel/message/85597 Mute This Topic: https://groups.io/mt/88365341/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- From nobody Mon Apr 29 00:08:26 2024 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+85599+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+85599+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954062; cv=none; d=zohomail.com; s=zohoarc; b=K7a+WMTg7gvDgmh1spZQpbAEd/8VMW1puUHzMrjJEKAv7AZIxya9v6kKUcWWh6juaf4b2DYKM5iIsKOd0zDlUnt/rXV+pj46Mg1AkS7GpEtS/opWcEGp0iwPj3HkPzvXp4QgBOT5PZa3Y+Z3mewoZd2yyhOTGEEwgqTSs8MDf0o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954062; 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=an3TqDljPhXfiTLulCz8u12QB8149qa/I1sszhK4U78=; b=Qip5gmJbStg1PP8wJbLfp6b2ClFmUQKRJx+w8DMpZKmY9+z3BOGTlTGkWeUkkH5Bx4XqNJgBFh9Xyz1VnsOiPahRbGy6XcZprTY8BH4Bf6FwYVdkXT9iRsAb3CgVkBMFu8OdS6vyOO0/F8guzixIWs01J6/VXMyptvreUHc42Fg= 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+85599+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 164195406262773.54182665044357; Tue, 11 Jan 2022 18:21:02 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id rJQXYY1788612xguY7sam3rE; 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.web11.18078.1641954050866873192 for ; Tue, 11 Jan 2022 18:20:52 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439830" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439830" 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="528990323" 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 , Sai Chaganty , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 15/27] NetworkFeaturePkg: Use MinPlatformPkg build include files Date: Tue, 11 Jan 2022 18:20:15 -0800 Message-Id: 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: arF5jBseqFWi4GlEwjWLsZ50x1787277AA= 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=kj1eASfCx2HrKuff8kZom7man/9OeqDndPzJlxcqCYg=; h=Cc:Date:From:Reply-To:Subject:To; b=YsNcZARNcOl2PDRawshiu666R8J3jOdqdoXCB+1X5YVEc+KvervlYeLxm29YCx13Mb0 Rv8hTv4cHwqeVMmAjmXX8cIbjOeYEZPSmpDUMMFrLkXUG8S+jDcY0w+5RUdWb5VaaquWV DpIVNSmoCNyB4J2Kxoc00cz74EJNbZ2ElAA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954064155100031 Content-Type: text/plain; charset="utf-8" Standalong build was not working due to missing libraries. Leverage MinPlatformPkg common includes for core libraries. Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone Reviewed-by: Sai Chaganty --- Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeature.dsc | 89 += +------------------ Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc | 18 += +++ 2 files changed, 24 insertions(+), 83 deletions(-) diff --git a/Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeatur= e.dsc b/Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeature.dsc index bbc91ecbb1..ca151b4e33 100644 --- a/Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeature.dsc +++ b/Features/Intel/Network/NetworkFeaturePkg/Include/NetworkFeature.dsc @@ -18,12 +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 + !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 !include NetworkPkg/NetworkDefines.dsc.inc =20 @@ -41,56 +41,9 @@ # ##########################################################################= ###### =20 -!include MdePkg/MdeLibs.dsc.inc - [LibraryClasses] !include NetworkPkg/NetworkLibs.dsc.inc - - ####################################### - # Edk2 Packages - ####################################### - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf - HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeC= offGetEntryPointLib.inf - PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibN= ull.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseRepor= tStatusCodeLibNull.inf - SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf - SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf - TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplat= e.inf TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf - UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManag= erLib.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf - UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServic= esLib.inf - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf - -[LibraryClasses.common.SEC,LibraryClasses.common.PEI_CORE,LibraryClasses.c= ommon.PEIM] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf - MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf - PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf - -[LibraryClasses.common.DXE_CORE,LibraryClasses.common.DXE_SMM_DRIVER,Libra= ryClasses.common.SMM_CORE,LibraryClasses.common.DXE_DRIVER,LibraryClasses.c= ommon.DXE_RUNTIME_DRIVER,LibraryClasses.common.UEFI_DRIVER,LibraryClasses.c= ommon.UEFI_APPLICATION] - ####################################### - # Edk2 Packages - ####################################### - DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf - DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableL= ib.inf - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf =20 ##########################################################################= ###### # @@ -106,21 +59,6 @@ # generated for it, but the binary will not be put into any firmware= volume. # ##########################################################################= ###### -# -# Feature PEI Components -# - -# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 -# is completed. -[Components.IA32] - ##################################### - # Network 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. =20 # # Feature DXE Components @@ -138,18 +76,3 @@ =20 # Add components here that should be included in the package build. !include NetworkPkg/NetworkComponents.dsc.inc - -##########################################################################= ######################### -# -# 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] diff --git a/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc= b/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc index 199686fa09..cdc5dc851d 100644 --- a/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc +++ b/Features/Intel/Network/NetworkFeaturePkg/NetworkFeaturePkg.dsc @@ -24,6 +24,24 @@ PEI_ARCH =3D IA32 DXE_ARCH =3D X64 =20 +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + +[PcdsFeatureFlag] + # + # 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. # --=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 (#85599): https://edk2.groups.io/g/devel/message/85599 Mute This Topic: https://groups.io/mt/88365343/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- From nobody Mon Apr 29 00:08:26 2024 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- From nobody Mon Apr 29 00:08:26 2024 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+85602+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+85602+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954064; cv=none; d=zohomail.com; s=zohoarc; b=MG4RBYFrQhd2e++nYoHVYE4/iy/2Ny1qfb37Mr0P6uj1zMmpb0z/yDLBUffwgULpzm6WNFczx0Vu/OO6ih+gCLqJ6VRJ2mMGi+E13Ehdyxocv6NRVTfHqyhnMTdWhitu1DT4QEUWS7s4cjlp/xG4dezoRaeLfkUCrGTenMhTv1o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954064; 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=GIQw8nz8XgHIIlYR96prK/X5WKBmh9Gwl8RSD6S4+oc=; b=c5RwL0yjhC6KUkHCQU2AhVj/GYuxY3QznuyEyHEcMppaLrB5/++mRnOkhYiJlQNlje5eNCI6qLa3qBCq4YAS0NpCwBnelK8CPf9n7plSHh03kQILoxeBFmWO2ioazA718MicsPGynfIrN2yAn4yxm+3qWOhM+wxO5X7h9GjKfFE= 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+85602+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 1641954064134433.1995864137467; Tue, 11 Jan 2022 18:21:04 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id ZI1sYY1788612xBUVXFckpmu; Tue, 11 Jan 2022 18:21:03 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.18083.1641954049814035968 for ; Tue, 11 Jan 2022 18:20:52 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439832" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439832" 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="528990329" 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 , Eric Dong , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 17/27] PostCodeDebugFeaturePkg: Complete as an advanced feature Date: Tue, 11 Jan 2022 18:20:17 -0800 Message-Id: <919e3268a0358c3d751c6ae5ce1e134d8ef35abc.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: iOFxB7T8NBC2UDYucHWyebmAx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954063; bh=7Xs8dMA+84vhZABYW5QvT46PvtYSu+fzswE29gx1nt4=; h=Cc:Date:From:Reply-To:Subject:To; b=IDmF75iuTn6KEnMDI2KayKo1KlsXPmVDwUgwgx3zvkJPzXLQvH8nDvuE1YuhE4VmKsB gAljCtaEOvkpfClgpfPMC6JZgIqeJDpE2h9wXX1zAscFYO2m3Mk8ruQ1trnu949u//yuu C09q/NO+3neOr+UcoO8/lm3B+4ZBKmuR6eo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954066269100045 Content-Type: text/plain; charset="utf-8" Add feature enable PCD. Use MinPlatformPkg build include files. Fix PEI_COR typo in PEI handler lib. Build StatusCodeHandler components with unique filename GUID. Add PreMemory.fdf and PostMemory.fdf include files. Improve Readme formatting and feature enabling checklist. Cc: Eric Dong Cc: Liming Gao Signed-off-by: Isaac Oram --- Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PostCodeDebugFeat= ure.dsc | 231 +++++--------------- Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PostMemory.fdf = | 14 ++ Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PreMemory.fdf = | 13 ++ Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStatusCod= eHandlerLib/PeiPostCodeStatusCodeHandlerLib.inf | 2 +- Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.d= ec | 11 + Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.d= sc | 30 +++ Features/Intel/Debugging/PostCodeDebugFeaturePkg/Readme.md = | 31 ++- 7 files changed, 146 insertions(+), 186 deletions(-) diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PostC= odeDebugFeature.dsc b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Incl= ude/PostCodeDebugFeature.dsc index 3d886fff38..31b0c02e79 100644 --- a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PostCodeDebu= gFeature.dsc +++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PostCodeDebu= gFeature.dsc @@ -12,192 +12,71 @@ # ## =20 -##########################################################################= ###### -# -# Defines Section - statements that will be processed to create a Makefile. -# -##########################################################################= ###### [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 + !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 -##########################################################################= ###### -# -# PCD Section - list of PCD Entries modified by the feature. -# -##########################################################################= ###### + DEFINE POST_CODE_PEIM_FILENAME =3D 3ea07dd3-f837-40c0-ac56-f3e18a30d01b + DEFINE POST_CODE_DXE_FILENAME =3D e7d785f5-e2f3-45e3-b0e7-2291a6c6dea6 + DEFINE POST_CODE_SMM_FILENAME =3D 02a955c7-48c0-4178-989b-b3fea4b3c6a2 =20 -# Unmark the following and StatusCodeHandler.efi to build the .dsc file di= rectly -#[PcdsDynamicDefault] -# gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUsePostCode|TRUE +[PcdsDynamicExDefault] + # + # By default, make the functional control DynamicExDefault PCD so that i= t can be enabled when debugging. + # + gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUsePostCode =20 -##########################################################################= ###### -# -# Library Class section - list of all Library Classes needed by this featu= re. -# -##########################################################################= ###### +[LibraryClasses.Common] + PostCodeMapLib|PostCodeDebugFeaturePkg/Library/PostCodeMapLib/PostCodeMa= pLib.inf =20 -!include MdePkg/MdeLibs.dsc.inc +[LibraryClasses.PEIM, LibraryClasses.PEI_CORE] + StatusCodeHandlerLib|PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeH= andlerLib/PeiPostCodeStatusCodeHandlerLib.inf =20 -[LibraryClasses] - ####################################### - # Edk2 Packages - ####################################### - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplat= e.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf - PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf +[LibraryClasses.DXE_RUNTIME_DRIVER] + StatusCodeHandlerLib|PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeH= andlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.inf =20 -[LibraryClasses.common.PEIM] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf - MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf - PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf +[LibraryClasses.DXE_SMM_DRIVER] + StatusCodeHandlerLib|PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeH= andlerLib/SmmPostCodeStatusCodeHandlerLib.inf =20 -[LibraryClasses.IA32.PEIM,LibraryClasses.IA32.PEI_CORE,LibraryClasses.IA32= .SEC] - ####################################### - # Edk2 Packages - ####################################### - ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiRepor= tStatusCodeLib.inf - -[LibraryClasses.common.DXE_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - -[LibraryClasses.common.DXE_RUNTIME_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf - ReportStatusCodeLib|MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/R= untimeDxeReportStatusCodeLib.inf - -[LibraryClasses.common.UEFI_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - -[LibraryClasses.X64.DXE_SMM_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableL= ib.inf - MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAlloc= ationLib.inf - SmmIoLib|MdePkg/Library/SmmIoLib/SmmIoLib.inf - SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf - ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/SmmRepor= tStatusCodeLib.inf - -##########################################################################= ###### -# -# Component section - list of all components that need built for this feat= ure. -# -# Note: The EDK II DSC file is not used to specify how compiled binary ima= ges get placed -# into firmware volume images. This section is just a list of module= s to compile from -# source into UEFI-compliant binaries. -# It is the FDF file that contains information on combining binary f= iles into firmware -# volume images, whose concept is beyond UEFI and is described in PI= specification. -# There may also be modules listed in this section that are not requ= ired in the FDF file, -# When a module listed here is excluded from FDF file, then UEFI-com= pliant binary will be -# generated for it, but the binary will not be put into any firmware= volume. -# -##########################################################################= ###### -# -# Feature PEI Components -# - -# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 -# is completed. [Components.IA32] - ##################################### - # PostCode Debug Feature Package - ##################################### =20 - # Add library instances here that are not included in package components= and should be tested - # in the package build. - PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/PeiPostCode= StatusCodeHandlerLib.inf + MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf { + + # + # Many boards already have StatusCodeHandler components built from t= he common core code + # Providing a unique name avoids collisions. Both status code handl= er components will + # install their listeners with the status code routers. + # + FILE_GUID =3D $(POST_CODE_PEIM_FILENAME) + + NULL|PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/Pe= iPostCodeStatusCodeHandlerLib.inf + } =20 - # The following is an example for used with StatusCodeHandler: -# MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf { -# -# OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/O= emHookStatusCodeLibNull.inf -# SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLib= Null.inf -# PostCodeLib|MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug= .inf -# PostCodeMapLib|PostCodeDebugFeaturePkg/Library/PostCodeMapLib/PostCo= deMapLib.inf -# NULL|PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/Pe= iPostCodeStatusCodeHandlerLib.inf -# } - - # Add components here that should be included in the package build. - -# -# Feature DXE Components -# - -# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 -# is completed. [Components.X64] - ##################################### - # PostCode Debug Feature Package - ##################################### + MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRun= timeDxe.inf { + + # + # Many boards already have StatusCodeHandler components built from t= he common core code + # Providing a unique name avoids collisions. Both status code handl= er components will + # install their listeners with the status code routers. + # + FILE_GUID =3D $(POST_CODE_DXE_FILENAME) + + NULL|PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/Ru= ntimeDxePostCodeStatusCodeHandlerLib.inf + } =20 - # Add library instances here that are not included in package components= and should be tested - # in the package build. - PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/RuntimeDxeP= ostCodeStatusCodeHandlerLib.inf - PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/SmmPostCode= StatusCodeHandlerLib.inf - - # The following is an example for used with StatusCodeHandler: -# MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRun= timeDxe.inf { -# -# OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/O= emHookStatusCodeLibNull.inf -# SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLib= Null.inf -# PostCodeLib|MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug= .inf -# PostCodeMapLib|PostCodeDebugFeaturePkg/Library/PostCodeMapLib/PostCo= deMapLib.inf -# NULL|PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/Ru= ntimeDxePostCodeStatusCodeHandlerLib.inf -# } - -# MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf { -# -# OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/O= emHookStatusCodeLibNull.inf -# SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLib= Null.inf -# PostCodeLib|MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug= .inf -# PostCodeMapLib|PostCodeDebugFeaturePkg/Library/PostCodeMapLib/PostCo= deMapLib.inf -# NULL|PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/Sm= mPostCodeStatusCodeHandlerLib.inf -# } - - # Add components here that should be included in the package build. - -##########################################################################= ######################### -# -# 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] + MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf { + + # + # Many boards already have StatusCodeHandler components built from t= he common core code + # Providing a unique name avoids collisions. Both status code handl= er components will + # install their listeners with the status code routers. + # + FILE_GUID =3D $(POST_CODE_SMM_FILENAME) + + NULL|PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/Sm= mPostCodeStatusCodeHandlerLib.inf + } diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PostM= emory.fdf b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PostMe= mory.fdf new file mode 100644 index 0000000000..1be9b369a8 --- /dev/null +++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PostMemory.f= df @@ -0,0 +1,14 @@ +## @file +# FDF file for post-memory BeepDebugFeature advanced feature. +# +# This file is intended to be included into another package so advanced f= eatures +# can be conditionally included in the flash image by enabling the respec= tive +# feature via its FeaturePCD. +# +# Copyright (C) 2022 Intel Corporation. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +INF FILE_GUID =3D $(POST_CODE_DXE_FILENAME) MdeModulePkg/Universal/StatusC= odeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf +INF FILE_GUID =3D $(POST_CODE_SMM_FILENAME) MdeModulePkg/Universal/StatusC= odeHandler/Smm/StatusCodeHandlerSmm.inf diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PreMe= mory.fdf b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PreMemo= ry.fdf new file mode 100644 index 0000000000..168ceb1712 --- /dev/null +++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Include/PreMemory.fdf @@ -0,0 +1,13 @@ +## @file +# FDF file for pre-memory BeepDebugFeature advanced feature. +# +# This file is intended to be included into another package so advanced f= eatures +# can be conditionally included in the flash image by enabling the respec= tive +# feature via its FeaturePCD. +# +# Copyright (C) 2022 Intel Corporation. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +INF FILE_GUID =3D $(POST_CODE_PEIM_FILENAME) MdeModulePkg/Universal/Status= CodeHandler/Pei/StatusCodeHandlerPei.inf diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostC= odeStatusCodeHandlerLib/PeiPostCodeStatusCodeHandlerLib.inf b/Features/Inte= l/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/Pe= iPostCodeStatusCodeHandlerLib.inf index c27578fe90..72df81c77f 100644 --- a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStat= usCodeHandlerLib/PeiPostCodeStatusCodeHandlerLib.inf +++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStat= usCodeHandlerLib/PeiPostCodeStatusCodeHandlerLib.inf @@ -15,7 +15,7 @@ FILE_GUID =3D FA32350A-63DB-4AC6-88D1-BC5327EE7ECE MODULE_TYPE =3D PEIM CONSTRUCTOR =3D PeiPostCodeStatusCodeHandlerLibConstr= uctor - LIBRARY_CLASS =3D StatusCodeHandlerLib|SEC PEIM PEI_COR + LIBRARY_CLASS =3D StatusCodeHandlerLib|SEC PEIM PEI_CORE =20 # # The following information is for reference only and not required by the = build tools. diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebug= FeaturePkg.dec b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeD= ebugFeaturePkg.dec index 5ba7b30ab6..42ac756a7c 100644 --- a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeature= Pkg.dec +++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeature= Pkg.dec @@ -28,5 +28,16 @@ [Guids] gPostCodeDebugFeaturePkgTokenSpaceGuid =3D {0x68886ac8, 0x7a29, 0x4845= , {0xa7, 0x02, 0xe9, 0x83, 0xc8, 0x7f, 0xfb, 0xab}} =20 +[PcdsFeatureFlag] + gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable|FAL= SE|BOOLEAN|0x00000002 + [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] + ## This PCD allows for dynamic control of post code use if so desired. + # + # The PCD value can be modified at boot time to activate and deactivate= the feature functionality. + # + # Note that this differs from PcdFeatureEnable which deter= mines whether the feature is included + # as an advanced feature in the flash image. If enabled, the feature is= then eligible to be activated/deactivated + # via this PCD. + # gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUsePostCode|FALSE|BO= OLEAN|0x00000001 diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebug= FeaturePkg.dsc b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeD= ebugFeaturePkg.dsc index 4f0bec4a6f..349604098f 100644 --- a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeature= Pkg.dsc +++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/PostCodeDebugFeature= Pkg.dsc @@ -24,6 +24,36 @@ PEI_ARCH =3D IA32 DXE_ARCH =3D X64 =20 +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + +[PcdsFeatureFlag] + # + # PCD needed for MinPlatform build includes + # + gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable = |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable = |FALSE + gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable = |FALSE + +[PcdsDynamicExDefault] + # + # PCD needed for this feature to build + # + gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUsePostCode|TRUE + +# +# Include common libraries +# +!include MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +!include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc +!include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc + +[LibraryClasses.Common] + # + # Required by common status code handler infrastructure + # + PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf + # # This package always builds the feature. # diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Readme.md b/F= eatures/Intel/Debugging/PostCodeDebugFeaturePkg/Readme.md index c49db35999..3fc52f1c00 100644 --- a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Readme.md +++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Readme.md @@ -16,7 +16,7 @@ It also provide a library of PostCodeMap lib, it map the = status code to post cod A library of PostCode lib is needed by platform. =20 In the library contstructor function, PostCodeStatusCodeHandlerLib registe= r the call back function for ReportStatusCode. -When called, it call GetPostCodeFromStatusCode() in PostCodeMapLib to get = post code from status code, and call PostCode() in PostCodeLib to show the = post code. +When called, it call GetPostCodeFromStatusCode () in PostCodeMapLib to get= post code from status code, and call PostCode () in PostCodeLib to show th= e post code. =20 PostCodeStatusCodeHandlerLib include 3 libraries for PEI, RuntimeDxe, SMM: * PeiPostCodeStatusCodeHandlerLib @@ -38,6 +38,7 @@ This library provide a function to get post code from sta= tus code. =20 ## Key Functions * In PeiPostCodeStatusCodeHandlerLib: +``` EFI_STATUS EFIAPI PostCodeStatusCodeReportWorker ( @@ -48,8 +49,10 @@ This library provide a function to get post code from st= atus code. IN CONST EFI_GUID *CallerId, IN CONST EFI_STATUS_CODE_DATA *Data OPTIONAL ) +``` =20 * In RuntimeDxePostCodeStatusCodeHandlerLib: +``` EFI_STATUS EFIAPI PostCodeStatusCodeReportWorker ( @@ -59,8 +62,10 @@ This library provide a function to get post code from st= atus code. IN EFI_GUID *CallerId, IN EFI_STATUS_CODE_DATA *Data OPTIONAL ) +``` =20 * In SmmPostCodeStatusCodeHandlerLib: +``` EFI_STATUS EFIAPI PostCodeStatusCodeReportWorker ( @@ -70,23 +75,28 @@ This library provide a function to get post code from s= tatus code. IN EFI_GUID *CallerId, IN EFI_STATUS_CODE_DATA *Data OPTIONAL ) +``` =20 * In PostCodeMapLib: +``` UINT32 EFIAPI GetPostCodeFromStatusCode ( IN EFI_STATUS_CODE_TYPE CodeType, IN EFI_STATUS_CODE_VALUE Value ) +``` =20 ## Configuration -* Link the library to StatusCodeHandler.efi. +* Link the library to StatusCodeHandler.efi to add this status code handle= r. +``` Example: MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerR= untimeDxe.inf { NULL|PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/= RuntimeDxePostCodeStatusCodeHandlerLib.inf } - Refer to PostCodeDebugFeature.dsc for other example. +``` + Refer to PostCodeDebugFeature.dsc for another example. * Config PCD gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUsePostCo= de. In platform .dsc file, need to config the type of gPostCodeDebugFeatureP= kgTokenSpaceGuid.PcdStatusCodeUsePostCode. Use PcdsFixedAtBuild to save binary size, and use PcdsDynamic if want to= enable/disable in runtime. @@ -98,20 +108,23 @@ This library provide a function to get post code from = status code. Status Code (ReportStatusCode) -> Post Code (GetPostCodeFromStatusCode). =20 ## Control Flows -ReportStatusCode() -> PostCodeStatusCodeReportWorker() -> GetPostCodeFromS= tatusCode() -> PostCode() +ReportStatusCode () -> PostCodeStatusCodeReportWorker () -> GetPostCodeFro= mStatusCode () -> PostCode () =20 ## Build Flows -There is not special build flows. +There are not special build flows. =20 ## Test Point Results -Verify the post code shown is correct. +There are no test points defined. =20 ## Functional Exit Criteria N/A =20 ## Feature Enabling Checklist -* Set the PCD gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUsePostC= ode to TRUE. -* The post code can be shown. +* Set the PCD gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatu= reEnable to TRUE. +* Select the PCD type desired and set the PCD gPostCodeDebugFeaturePkgToke= nSpaceGuid.PcdStatusCodeUsePostCode to TRUE. +* Implemented a platform specific PostCodeMapLib if needed. +* Verify the post code can be shown correctly. =20 ## Common Optimizations -* Implemented platform's special PostCodeMapLib if needed. +* Set gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdStatusCodeUsePostCode base= d on a larger, board specific, size + optimization or performance optimization setting. --=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 (#85602): https://edk2.groups.io/g/devel/message/85602 Mute This Topic: https://groups.io/mt/88365346/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- From nobody Mon Apr 29 00:08:26 2024 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+85603+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+85603+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954064; cv=none; d=zohomail.com; s=zohoarc; b=SXi6mQ/GJh+kTvOc0YJrTjVUN+YKNPWWOP1MRe23oIVQCf0iEVtGKXPNCHU0aA1TnUeuSvMbocrd1TK3yTe0YwwFOQN7x/qpWn4vuOYoVX9RftxtFzXounq09kdvbTQrbxzX4mlCQQ0GTy3h6BYQQ+UnQX5IouM/uHZ0tJj60v8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954064; 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=r87YAVKb4lHa1Jt3JFbFvxqf65YwMCOV7Q13M4T5EcQ=; b=WWdrWZ0v0rYrb3W90bpzGkezDeLU23DBWZ4LoV3WOrjWNiaWHYQMs9m6UsAPMOY8Q36ZKXEW1VomQtcWTAnFx0OADySwaxI9KdP54amKFfB/KGMypD1i5sFi3NpsD54UhR98Ea9SoMAsNxPY8G4/Nnq0JJdnqIhBSEcUmGm4WIk= 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+85603+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 1641954064602405.9205427202986; Tue, 11 Jan 2022 18:21:04 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id OT3yYY1788612xMMpKId4v46; Tue, 11 Jan 2022 18:21:04 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.18078.1641954050866873192 for ; Tue, 11 Jan 2022 18:20:52 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439833" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439833" 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="528990333" 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 , Eric Dong , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 18/27] AcpiDebugFeaturePkg: Use MinPlatformPkg build include files Date: Tue, 11 Jan 2022 18:20:18 -0800 Message-Id: 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: uYNOOzngjsSRZt5Du6b17QP2x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954064; bh=iLiqv8fKm0Fpr2iWB00MYLx6M8iA15ZkVxckVrKSExk=; h=Cc:Date:From:Reply-To:Subject:To; b=ctrKxYHMhY9hZPIEaessD6RpATjPlWjyO6MA7yCCJFJX4/s6ocWNFlw4Ucb5EFLr+m2 OOthm1s7RsTnQPb15U9L07mWxesC5l6JEOMYu5rNLUCIwZCTeviUOQd3j3+brPU2ZKWqy a/ig+b4FgzU186aNANQHiLbv/Kt6kVZgpHY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954066307100048 Content-Type: text/plain; charset="utf-8" Use the MinPlatformPkg common core build files to build libraries needed by this feature. Cc: Eric Dong Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc = | 21 ++++++ Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc = | 70 -------------------- Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf = | 4 +- 3 files changed, 23 insertions(+), 72 deletions(-) diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeatureP= kg.dsc b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.d= sc index 62cc559d8f..3b76d39ea8 100644 --- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc +++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dsc @@ -24,6 +24,27 @@ PEI_ARCH =3D IA32 DXE_ARCH =3D X64 =20 +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + +# +# Since there are no 32b libraries or components in this package, these PC= D are specified for 64b only +# +[PcdsFeatureFlag.X64] + # + # 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. # diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebug= Feature.dsc b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebu= gFeature.dsc index b142978be1..f5b8bacee0 100644 --- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature= .dsc +++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature= .dsc @@ -25,45 +25,6 @@ !error "DXE_ARCH must be specified to build this feature!" !endif =20 -##########################################################################= ###### -# -# 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/BaseMemoryLib/BaseMemoryLib.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf - -[LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.DXE_RUNTIME_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - -[LibraryClasses.common.DXE_SMM_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAlloc= ationLib.inf - SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableL= ib.inf - ##########################################################################= ###### # # Component section - list of all components that need built for this feat= ure. @@ -78,22 +39,6 @@ # generated for it, but the binary will not be put into any firmware= volume. # ##########################################################################= ###### -# -# Feature PEI Components -# - -# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 -# is completed. -[Components.IA32] - ##################################### - # ACPI Debug 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. - # # Feature DXE Components # @@ -111,18 +56,3 @@ # Add components here that should be included in the package build. AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugDxe.inf AcpiDebugFeaturePkg/AcpiDebugDxeSmm/AcpiDebugSmm.inf - -##########################################################################= ######################### -# -# 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] diff --git a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemor= y.fdf b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf index 84560dae50..855826292c 100644 --- a/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf +++ b/Features/Intel/Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf @@ -7,5 +7,5 @@ # ## =20 - INF RuleOverride =3D DRIVER_ACPITABLE AcpiDebugFeaturePkg/AcpiDebugDxeSm= m/AcpiDebugDxe.inf - INF RuleOverride =3D DRIVER_ACPITABLE AcpiDebugFeaturePkg/AcpiDebugDxeSm= m/AcpiDebugSmm.inf +INF RuleOverride =3D DRIVER_ACPITABLE AcpiDebugFeaturePkg/AcpiDebugDxeSmm/= AcpiDebugDxe.inf +INF RuleOverride =3D DRIVER_ACPITABLE AcpiDebugFeaturePkg/AcpiDebugDxeSmm/= AcpiDebugSmm.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 (#85603): https://edk2.groups.io/g/devel/message/85603 Mute This Topic: https://groups.io/mt/88365347/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- From nobody Mon Apr 29 00:08:26 2024 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+85607+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+85607+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954066; cv=none; d=zohomail.com; s=zohoarc; b=OOPD4YQR2v1O1wq5gH5Rb7VWNk4h3qyJO1V0jKIXANSsWpVMO49uVDZqF9sLaIBBZsuKVTuJGI6O44deBsZbcat2Fbq/QYGHEQKKH7DDPz4zIFE1WPLcN8xzWdMgZ7xhEzvgu7prVbbuUyDZWxujSjJcw+KBT0OP9qdJN3RB34Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954066; 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=4Nv9pZHaSNqdUi7kEZw6wYzGTaU6WadT8mlsXHydWQc=; b=ACUZtlzBIxvYaJ854wx71PriFRtnDV4gSMaXni4D3iT0I9cf/EijtauDt5Vf1KPD7Pp/HqVbwGsUxrgaiQXEO3AyHchgJTKB8Vku02HVK7/iTApVQRgWjkdoDLWl9cZAn55WCiDjvW2v3h9akaxpqYs6GUMchsdDiD5CXUWmsko= 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+85607+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 1641954066634262.02526831746184; Tue, 11 Jan 2022 18:21:06 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id NZ2QYY1788612x4iNQj6Ltdq; Tue, 11 Jan 2022 18:21:06 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.18083.1641954049814035968 for ; Tue, 11 Jan 2022 18:20:52 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="243439835" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439835" 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="528990337" 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 , Eric Dong , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 19/27] Usb3DebugFeaturePkg: Align with feature design guidelines Date: Tue, 11 Jan 2022 18:20:19 -0800 Message-Id: <73c2a258db12f55a69b20e4580b3e78768a72ad0.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: GguYfCxlP5eZ2NW6t6fGCrAIx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954066; bh=6F0q9cUtzAbq306r3oe4yZ8lJqSB+utKp67d30AZ/8o=; h=Cc:Date:From:Reply-To:Subject:To; b=tqq8zWilGPQvUcfsqAHZQ7mSlvMIQAUI06ZDrHKAcoC2J+Ge0ueK+4Ulny5YKTgC0eQ CAPPUbH7LJ0sx4qYftAtRHswjmFEqv/up+0Eb+9qnc6VqBrFQgQIKirWp6cleur2nz74Z GA1688oaKrTcE7EGsS+/JIVBBBrePT8M7L4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954068603100066 Content-Type: text/plain; charset="utf-8" Remove build of common libraries. Boards will already have those. Modified Usb3DebugFeature.dsc to treat libraries like libraries. Usb3DebugFeaturePkg.dsc uses the component trick for standalone build testing of the libraries. Added a PCD to allow board to select between NULL, regular, and IO MMU library instances. Prior implementation of Usb3DebugFeature.dsc was not useful as an includable file because it didn't specify LibaryClass instance to use. Removed unused CMOS PCD. Updated some of the readme sections. Cc: Eric Dong Cc: Liming Gao Signed-off-by: Isaac Oram --- Features/Intel/Debugging/Usb3DebugFeaturePkg/Include/Usb3DebugFeature.dsc = | 131 ++++---------------- Features/Intel/Debugging/Usb3DebugFeaturePkg/Readme.md = | 50 +++++--- Features/Intel/Debugging/Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dec = | 14 +-- Features/Intel/Debugging/Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dsc = | 18 +++ 4 files changed, 81 insertions(+), 132 deletions(-) diff --git a/Features/Intel/Debugging/Usb3DebugFeaturePkg/Include/Usb3Debug= Feature.dsc b/Features/Intel/Debugging/Usb3DebugFeaturePkg/Include/Usb3Debu= gFeature.dsc index 1e3aaecd5d..a87a5b428b 100644 --- a/Features/Intel/Debugging/Usb3DebugFeaturePkg/Include/Usb3DebugFeature= .dsc +++ b/Features/Intel/Debugging/Usb3DebugFeaturePkg/Include/Usb3DebugFeature= .dsc @@ -31,122 +31,35 @@ # ##########################################################################= ###### =20 -!include MdePkg/MdeLibs.dsc.inc +[LibraryClasses.Common] + Usb3DebugPortParamLibo|Usb3DebugFeaturePkg/Library/Usb3DebugPortParamLib= Pcd/Usb3DebugPortParamLibPcd.inf =20 -[LibraryClasses] - ####################################### - # Edk2 Packages - ####################################### - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf - IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplat= e.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf - -[LibraryClasses.common.PEIM] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf - MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAlloc= ationLib.inf - PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf - -[LibraryClasses.common.DXE_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - -[LibraryClasses.common.DXE_RUNTIME_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf - -[LibraryClasses.common.UEFI_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - -##########################################################################= ###### -# -# Component section - list of all components that need built for this feat= ure. -# -# Note: The EDK II DSC file is not used to specify how compiled binary ima= ges get placed -# into firmware volume images. This section is just a list of module= s to compile from -# source into UEFI-compliant binaries. -# It is the FDF file that contains information on combining binary f= iles into firmware -# volume images, whose concept is beyond UEFI and is described in PI= specification. -# There may also be modules listed in this section that are not requ= ired in the FDF file, -# When a module listed here is excluded from FDF file, then UEFI-com= pliant binary will be -# generated for it, but the binary will not be put into any firmware= volume. -# -##########################################################################= ###### # -# Feature PEI Components +# If NULL Usb3DebugPortLib library instance desired # - -# @todo: Change below line to [Components.$(PEI_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 -# is completed. -[Components.IA32] - ##################################### - # USB3 Debug Feature Package - ##################################### - - # Add library instances here that are not included in package components= and should be tested - # in the package build. - Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibNull.inf - Usb3DebugFeaturePkg/Library/Usb3DebugPortParamLibPcd/Usb3DebugPortParamL= ibPcd.inf - Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibPei.inf - Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibPeiIoMmu.inf - - # Add components here that should be included in the package build. +!if gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance =3D=3D 0 + [LibraryClasses.Common] + Usb3DebugPortLib|Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3Debu= gPortLibNull.inf +!endif =20 # -# Feature DXE Components +# If regular Usb3DebugPortLib library instance desired # +!if gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance =3D=3D 1 + [LibraryClasses.PEI_CORE, LibraryClasses.PEIM] + Usb3DebugPortLib|Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3Debu= gPortLibPei.inf =20 -# @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 -# is completed. -[Components.X64] - ##################################### - # USB3 Debug Feature Package - ##################################### - - # Add library instances here that are not included in package components= and should be tested - # in the package build. - Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibNull.inf - Usb3DebugFeaturePkg/Library/Usb3DebugPortParamLibPcd/Usb3DebugPortParamL= ibPcd.inf - Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibDxe.inf - Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibDxeIoMmu.inf + [LibraryClasses.DXE_CORE, LibraryClasses.DXE_DRIVER, LibraryClasses.DXE_= RUNTIME_DRIVER, LibraryClasses.SMM_CORE, LibraryClasses.DXE_SMM_DRIVER, Lib= raryClasses.UEFI_DRIVER] + Usb3DebugPortLib|Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3Debu= gPortLibDxe.inf +!endif =20 - # Add components here that should be included in the package build. - -##########################################################################= ######################### -# -# 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. +# If regular Usb3DebugPortLib library instance desired # -##########################################################################= ######################### -[BuildOptions] +!if gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance =3D=3D 2 + [LibraryClasses.PEI_CORE, LibraryClasses.PEIM] + Usb3DebugPortLib|Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3Debu= gPortLibPeiIoMmu.inf + + [LibraryClasses.DXE_CORE, LibraryClasses.DXE_DRIVER, LibraryClasses.DXE_= RUNTIME_DRIVER, LibraryClasses.SMM_CORE, LibraryClasses.DXE_SMM_DRIVER, Lib= raryClasses.UEFI_DRIVER] + Usb3DebugPortLib|Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3Debu= gPortLibDxeIoMmu.inf +!endif diff --git a/Features/Intel/Debugging/Usb3DebugFeaturePkg/Readme.md b/Featu= res/Intel/Debugging/Usb3DebugFeaturePkg/Readme.md index dc92f108ff..c8afcf9fd2 100644 --- a/Features/Intel/Debugging/Usb3DebugFeaturePkg/Readme.md +++ b/Features/Intel/Debugging/Usb3DebugFeaturePkg/Readme.md @@ -29,12 +29,15 @@ The description should not be constrained to implementa= tion details but provide feature is supposed to work. =20 ## Firmware Volumes -*_TODO_* -A bulleted list of the firmware volumes that feature module(s) are placed = in. +Not applicable, the feature only produces libraries. =20 ## Modules -*_TODO_* -A bulleted list of the modules that make up the feature. +* Usb3DebugPortLibDxe +* Usb3DebugPortLibDxeIoMmu +* Usb3DebugPortLibNull +* Usb3DebugPortLibPei +* Usb3DebugPortLibPeiIoMmu +* Usb3DebugPortParamLibPcd =20 ## *_TODO_* @@ -76,11 +79,7 @@ This is particularly useful for features that use custom= build tools or require standard flow in the feature package template is used, this section may be= empty. =20 ## Test Point Results -*_TODO_* -The test(s) that can verify porting is complete for the feature. - -Each feature must describe at least one test point to verify the feature i= s successful. If the test point is not -implemented, this should be stated. +No test points implemented =20 ## Functional Exit Criteria *_TODO_* @@ -90,8 +89,28 @@ This section should provide an ordered list of criteria = that a board integrator functional on their board. =20 ## Feature Enabling Checklist -*_TODO_* -An ordered list of required activities to achieve desired functionality fo= r the feature. +* In the board DSC file, enable the feature +``` +[PcdsFeatureFlag] + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable|TRUE +``` +* In the board DSC file, select the implementation desired +``` +[PcdsFixedAtBuild] + # 0 =3D Non-functional instance + # 1 =3D Regular instance + # 2 =3D IO MMU instance + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|1 +``` +* In the board DSC file, configure the PCI device information +``` +[PcdsFixedAtBuild] + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsbSerialXhciBus|0x00 + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsbSerialXhciDev|0x14 + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsbSerialXhciFunc|0x00 + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdXhciDefaultBaseAddress|0xFEA10000 +``` + =20 ## Performance Impact A general expectation for the impact on overall boot performance due to us= ing this feature. @@ -102,7 +121,8 @@ This section is expected to provide guidance on: * How to manage performance impact of the feature =20 ## Common Optimizations -*_TODO_* -Common size or performance tuning options for this feature. - -This section is recommended but not required. If not used, the contents sh= ould be left empty. +* In the board DSC file, tune the timeout value +``` +[PcdsFixedAtBuild] + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdXhciHostWaitTimeout|2000000 +``` diff --git a/Features/Intel/Debugging/Usb3DebugFeaturePkg/Usb3DebugFeatureP= kg.dec b/Features/Intel/Debugging/Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.d= ec index 2b19e48491..353001b0f8 100644 --- a/Features/Intel/Debugging/Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dec +++ b/Features/Intel/Debugging/Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dec @@ -36,6 +36,12 @@ gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable|FALSE|BOOLE= AN|0xA0000001 =20 [PcdsFixedAtBuild] + ## This PCD allows the board to select the Usb3DebugPortLib instance des= ired + # 0 =3D NULL instance + # 1 =3D Regular instance + # 2 =3D IO MMU instance + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|0|UINT8|0= xF0000009 + ## These PCD specify XHCI controller Bus/Device/Function, which are used= to enable # XHCI debug device. gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsbSerialXhciBus|0x00|UINT8|0xF000= 0001 @@ -47,11 +53,3 @@ # Default timeout value is 2000000 microseconds. # If user does not want system stall for long time, it can be set to sm= all value. gUsb3DebugFeaturePkgTokenSpaceGuid.PcdXhciHostWaitTimeout|2000000|UINT64= |0xF0000005 - - ## This PCD sepcifies the start index in CMOS, it will occupy 1 bytes sp= ace. - gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortBusIndex|0x59|UINT8|0= xF0000006 - ## This PCD sepcifies the start index in CMOS, it will occupy 1 bytes sp= ace. - gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortDeviceIndex|0x5A|UINT= 8|0xF0000007 - ## This PCD sepcifies the start index in CMOS, it will occupy 1 bytes sp= ace. - gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortFunctionIndex|0x5B|UI= NT8|0xF0000008 - diff --git a/Features/Intel/Debugging/Usb3DebugFeaturePkg/Usb3DebugFeatureP= kg.dsc b/Features/Intel/Debugging/Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.d= sc index 02627d2ed4..6965d26721 100644 --- a/Features/Intel/Debugging/Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dsc +++ b/Features/Intel/Debugging/Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dsc @@ -24,7 +24,25 @@ PEI_ARCH =3D IA32 DXE_ARCH =3D X64 =20 +[PcdsFixedAtBuild] + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|0 + # # This package always builds the feature. # !include Include/Usb3DebugFeature.dsc + +# +# This package currently only contains library classes. To force them to = be built since there is no code to use them +# we just tell the build that they are components and the build will compi= le the libraries +# + +[Components] + Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibNull.inf + Usb3DebugFeaturePkg/Library/Usb3DebugPortParamLibPcd/Usb3DebugPortParamL= ibPcd.inf + + Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibPei.inf + Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibPeiIoMmu.inf + + Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibDxe.inf + Usb3DebugFeaturePkg/Library/Usb3DebugPortLib/Usb3DebugPortLibDxeIoMmu.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 (#85607): https://edk2.groups.io/g/devel/message/85607 Mute This Topic: https://groups.io/mt/88365351/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- From nobody Mon Apr 29 00:08:26 2024 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+85606+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+85606+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954066; cv=none; d=zohomail.com; s=zohoarc; b=SFwryjcGNrE+sDBZkBFJNd6hsRmh8X6jmvTnay0bV3dsr+gbHhX39rUbhZe+PqxkIg5ziZEYTorxsrmFrDiECd8T2jJQywwjfKV3KA1faOne99fObOVMe7hxOXsmYnT6mFlfhzTVx/TjuiHNvE28tvTIjCBsVAmMJotSSK5nGFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954066; 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=o8+fyf+PthM0q2UWFOCRYBF3xfmTCPpU20kOYSD93W0=; b=PsGhuyRiUpuuwCgfJp41TtUObdrCks38r2yJUQ9MqIO286nj3+IM752JM8V36WEva8KEFuUkXRHgt9Cb4osVORH2TryyZKUj3uwzyvROnyiqEUWKJzEcrDDIBZUx2HEVOFXYOGnEKNYvVkBcI8OQn6/vPAn1TUGD0tv9JIjrM6g= 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+85606+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 1641954066113218.30883219609018; Tue, 11 Jan 2022 18:21:06 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id EGy2YY1788612xda1D6Sn9Ta; Tue, 11 Jan 2022 18:21:05 -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="243439837" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="243439837" 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="528990339" 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 , Sai Chaganty , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 20/27] SpcrFeaturePkg: Use MinPlatform build include files Date: Tue, 11 Jan 2022 18:20:20 -0800 Message-Id: <9fe41786a6142a31b8724632f37eab047e3d9deb.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: OH8i2hFRZVxASVlhnML0Cughx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954065; bh=96GJCkLTIHViTUNM00T8ot0oFGEcOU/fnx/dX3CuF1E=; h=Cc:Date:From:Reply-To:Subject:To; b=HmLil+0dkXsh2YxzpE6hnAG2XhYt8x7bvP2bjWxUwJ9QRvA/ZL3K0CO90LU4lJqMc3X VvTTdAAspXfuELlIByz6nfa3APrtl2ksxDCFaFi4dOk/8uX9YculcInWxZTk/DdSYjw8f ZXkYxFRa/GuoElklVtmRbl7cTgapNS2IdA0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954066585100058 Content-Type: text/plain; charset="utf-8" Also added feature enable flag Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone Reviewed-by: Sai Chaganty --- Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/Library/SpcrDevi= ceLib.h | 2 +- Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/PostMemory.fdf = | 13 ++++ Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/PreMemory.fdf = | 11 ++++ Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/SpcrFeature.dsc = | 62 -------------------- Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Readme.md = | 12 ++-- Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dec = | 6 ++ Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dsc = | 18 ++++++ 7 files changed, 55 insertions(+), 69 deletions(-) diff --git a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/Libr= ary/SpcrDeviceLib.h b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Inc= lude/Library/SpcrDeviceLib.h index 947813815e..2e50270ee6 100644 --- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/Library/Spc= rDeviceLib.h +++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/Library/Spc= rDeviceLib.h @@ -12,7 +12,7 @@ =20 /** Get a Serial Port device used for SPCR. - The caller should call FreePool() to free the memory if return value is = not NULL. + The caller should call FreePool () to free the memory if return value is= not NULL. =20 @retval NULL Can not get device. @retval Others A serial port device path. diff --git a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/Post= Memory.fdf b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/Post= Memory.fdf new file mode 100644 index 0000000000..f963f567c2 --- /dev/null +++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/PostMemory.= fdf @@ -0,0 +1,13 @@ +## @file +# FDF file for post-memory SpcrFeature advanced feature. +# +# This file is intended to be included into another package so advanced f= eatures +# can be conditionally included in the flash image by enabling the respec= tive +# feature via its FeaturePCD. +# +# Copyright (C) 2022 Intel Corporation. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +INF SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpiDxe.inf diff --git a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/PreM= emory.fdf b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/PreMe= mory.fdf new file mode 100644 index 0000000000..3c461e7fbc --- /dev/null +++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/PreMemory.f= df @@ -0,0 +1,11 @@ +## @file +# FDF file for pre-memory SpcrFeature advanced feature. +# +# This file is intended to be included into another package so advanced f= eatures +# can be conditionally included in the flash image by enabling the respec= tive +# feature via its FeaturePCD. +# +# Copyright (C) 2022 Intel Corporation. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## diff --git a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/Spcr= Feature.dsc b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/Spc= rFeature.dsc index c51e552df5..b06ddf4fe6 100644 --- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/SpcrFeature= .dsc +++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Include/SpcrFeature= .dsc @@ -25,40 +25,9 @@ !error "DXE_ARCH must be specified to build this feature!" !endif =20 -##########################################################################= ###### -# -# 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 - UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntry= Point.inf - UefiLib|MdePkg/Library/UefiLib/UefiLib.inf - PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBoo= tServicesTableLib.inf - DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf - UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/U= efiRuntimeServicesTableLib.inf - - ####################################### - # SpcrFeaturePkg Packages - ####################################### SpcrDeviceLib|SpcrFeaturePkg/Library/SpcrDeviceLibNull/SpcrDeviceLibNull= .inf =20 -[LibraryClasses.common.DXE_DRIVER] - ####################################### - # Edk2 Packages - ####################################### - MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAll= ocationLib.inf - ##########################################################################= ###### # # Component section - list of all components that need built for this feat= ure. @@ -74,38 +43,7 @@ # ##########################################################################= ###### =20 -# -# Feature DXE Components -# - # @todo: Change below line to [Components.$(DXE_ARCH)] after https://bugzi= lla.tianocore.org/show_bug.cgi?id=3D2308 # is completed. [Components.X64] - ##################################### - # Spcr 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. SpcrFeaturePkg/SpcrAcpiDxe/SpcrAcpiDxe.inf - #{ -# -# SpcrDeviceLib|SpcrFeaturePkg/Library/SpcrDeviceLibNull/SpcrDeviceLi= bNull.inf -# } - -##########################################################################= ######################### -# -# 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] diff --git a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Readme.md b/= Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Readme.md index 0a5d48876d..66138ee0f6 100644 --- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Readme.md +++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/Readme.md @@ -22,10 +22,10 @@ Platform can implement its own library to select the se= rial port device. * SpcrDeviceLibNull =20 ## SpcrAcpiDxe -The main driver of convert the serial port device info to ACPI table. -It will call the function GetSpcrDevice() in the library SpcrDeviceLib to = get the serial port device path. +The main driver of convert the serial port device info into an ACPI table. +It will call the function GetSpcrDevice () in the library SpcrDeviceLib to= get the serial port device path. If the serial port device path is not NULL, then use gEfiPciIoProtocolGuid= to get the PCI info, and use the gEfiSerialIoProtocolGuid to get the seria= l port info, such as the baud rate etc. -If the serial port device is PCI device 00:16:03 (AMT serial over lan PCI = device), then will set the BaseAddress. +If the serial port device is PCI device 00:16:03 (AMT serial over LAN PCI = device), then will set the BaseAddress. At last fill the ACPI table as Windows required. =20 ## SpcrDeviceLibNull @@ -37,19 +37,19 @@ Fill the serial port device info used for SPCR to ACPI = table. =20 ## Configuration There is not special configuration. -But the platform maybe implemente its own SpcrDeviceLib. +But the platform may implement its own SpcrDeviceLib. =20 ## Data Flows GetSpcrDevice() -> serial port device path -> get PCI info and serial port= info -> ACPI table. =20 ## Control Flows -GetSpcrDevice() in SpcrDeviceLib -> SpcrAcpiDxe. +GetSpcrDevice () in SpcrDeviceLib -> SpcrAcpiDxe. =20 ## Build Flows There is not special build flow. =20 ## Test Point Results -* Check the output ACPI table. +There are not test points implemented. =20 ## Functional Exit Criteria * Check the output ACPI table. diff --git a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeatureP= kg.dec b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.d= ec index 03776abf06..b084fad892 100644 --- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dec +++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dec @@ -21,6 +21,12 @@ [Includes] Include =20 +[Guids] + gSpcrFeaturePkgTokenSpaceGuid =3D { 0xe978c988, 0xeeba, 0x4671, { 0xb8, = 0x0d, 0xcc, 0x8b, 0x89, 0xb5, 0xd1, 0xef }} + +[PcdsFeatureFlag] + gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable|FALSE|BOOLEAN|0x00000= 001 + [LibraryClasses] ## @libraryclass Provides an API for get SPCR device. # diff --git a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeatureP= kg.dsc b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.d= sc index 82d2d3ac73..2ee874a58e 100644 --- a/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dsc +++ b/Features/Intel/OutOfBandManagement/SpcrFeaturePkg/SpcrFeaturePkg.dsc @@ -24,6 +24,24 @@ PEI_ARCH =3D IA32 DXE_ARCH =3D X64 =20 +[Packages] + MinPlatformPkg/MinPlatformPkg.dec + +[PcdsFeatureFlag] + # + # 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. # --=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 (#85606): https://edk2.groups.io/g/devel/message/85606 Mute This Topic: https://groups.io/mt/88365350/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- From nobody Mon Apr 29 00:08:26 2024 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+85587+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+85587+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1641954053; cv=none; d=zohomail.com; s=zohoarc; b=VwuaUQX/YYw8/65GN2mBtnG2g+hDLpIIKXGWHLVMd+ftWKBT/hlf5nns46eMNdpP7xOFB2RiKYa8Pfh8nY0wHJ6xVhulrfRhCEtaZMaG1j4debNZvVQGGhZtB2UaN2tfNu3lysqF7K+UvDSYxOAw9GJuYlg+rmJSWBC3iC0i5rU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641954053; 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=EdJrrF1yMcTio84vHJV6M6bBL2G1iC9BFpNnxnQjG6w=; b=lHL93FKWE70urKyUPbOBOvqPawdkq6KSSsmw9QH0Ym4ZaKLHq/r29u1N4+Amjd8IWL9o4A41F1Y83lhFczv96Dis1xByusa/cZzd1z0Ka+ysf3LejefE8rbgowLsWrhy+0du2pzfLUWe9PZXnpjiFE9KmD5YliK0ujhNS8mpohs= 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+85587+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 1641954053332908.2107246693226; Tue, 11 Jan 2022 18:20:53 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id ejcQYY1788612xeTIIW34jXk; Tue, 11 Jan 2022 18:20:53 -0800 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.17893.1641954050249506235 for ; Tue, 11 Jan 2022 18:20:50 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10224"; a="306994437" X-IronPort-AV: E=Sophos;i="5.88,281,1635231600"; d="scan'208";a="306994437" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.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="528990343" 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 , Sai Chaganty , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V1 21/27] TemplateFeaturePkg: Use MinPlatform build include files Date: Tue, 11 Jan 2022 18:20:21 -0800 Message-Id: <54347624c0e7750ec4ecc7115e6890f4e3300745.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: kBUGtFaoqTnd5G9RYUjRmHMnx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1641954053; bh=nBMBdyZZpiouNIYItw/2S2o9GciATwhvewNBN8fC2I0=; h=Cc:Date:From:Reply-To:Subject:To; b=fzrHbKb98Zuh2Efd3OCFaWK24yzRFCVJTfOMPXtk0h5dxQcQD1RqSAL+C8E2PCk4l0Q mqCmzTnPx0XU8awta8gtj655gXQfrvEpytMjRAHre1k7gr6uHFJqIREsHPK9Ueq7julc1 15mbZ8g23IH2RMh4hvIHW2lIuNGwWECtSZk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1641954055435100017 Content-Type: text/plain; charset="utf-8" Extend the template to leverage common library build files. Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone Reviewed-by: Sai Chaganty --- Features/Intel/TemplateFeaturePkg/Include/TemplateFeature.dsc | 2 +- Features/Intel/TemplateFeaturePkg/TemplateFeaturePkg.dsc | 18 +++++++= +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Features/Intel/TemplateFeaturePkg/Include/TemplateFeature.dsc = b/Features/Intel/TemplateFeaturePkg/Include/TemplateFeature.dsc index 6742eddcf9..dd6d033aca 100644 --- a/Features/Intel/TemplateFeaturePkg/Include/TemplateFeature.dsc +++ b/Features/Intel/TemplateFeaturePkg/Include/TemplateFeature.dsc @@ -73,7 +73,7 @@ # is completed. [Components.IA32] ##################################### - # Feature Package + #