From nobody Tue May 7 00:53:22 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+85844+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+85844+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641270; cv=none; d=zohomail.com; s=zohoarc; b=SEDKYY/b4o28dkiJtlPfWsZ0ULsPTercfTe51fLh9blDWd6CNXbW03VBepktBvWKawaStksDycMa2vS7di5EQVg+X325NBkYKEulMbEui1353FljbzDcbHXe1VotXwNY5GSVzLQp9Nk+tYh1Zsie4AOnlXqjZA1OtuWxKJpcdo4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641270; 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=522qLzbItb6nAmmZ5T1BFn5HQ/mwpv3njx99iCKe7ZQ=; b=Dz7XNJa0aR+rOTyZWM0UB+aNElt+hg7aq91uoOpDzvNVX6Ut+tXXPGLwGKbg6JE/oBZOkDBBOwnuAY8sFO9Og1+6kbDuhWV4OakL7qDpt/AThHkMWSUJvy7q+TSdKZ9TyEw1qslnF2BJJI4v0HJe8auvsFNbxwpEykpkE8JeEIQ= 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+85844+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 164264127060626.141475480426607; Wed, 19 Jan 2022 17:14:30 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id uA7RYY1788612xlGPUi2Br4Y; Wed, 19 Jan 2022 17:14:30 -0800 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.5671.1642641268438975674 for ; Wed, 19 Jan 2022 17:14:29 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="269638483" X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="269638483" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:27 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559789" 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; 19 Jan 2022 17:14:26 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Sai Chaganty , Liming Gao , Eric Dong , Ming Tan Subject: [edk2-devel][edk2-platforms][PATCH V2 01/14] BeepDebugFeaturePkg: Use MinPlatformPkg build include files Date: Wed, 19 Jan 2022 17:13:56 -0800 Message-Id: <9b961acd5cb5e3a68f09fcbc99bf142d1b5c270b.1642640106.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: 8pEteaHx0Zz5fUEhFjLl5viux1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641270; bh=/jI0uQRDfjUbryKEUSWaH2gDMoPrPgaTD+19+1Bd8p4=; h=Cc:Date:From:Reply-To:Subject:To; b=jOiS9TpRaD+6iaqYLYBbM40HOChdrXnVEaUBx44/9V3hoIKSXHUGuRQzuyTv7iAjyci rNY4fOZ/6iqyBg/b8xBrm6gpHUBuqSm0w9E34eFI1D0ti1G//lz0wyzGn9dnk1XjZt56p 3qBR6Eu0PeCGfkeQOvPjApjwVRyAO8r+lzY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641272422100002 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..00ef022657 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|BeepDebugFeaturePkg/Library/BeepLib/BeepLibNull.inf + BeepMapLib|BeepDebugFeaturePkg/Library/BeepMapLib/BeepMapLib.inf + +[LibraryClasses.PEIM, LibraryClasses.PEI_CORE] + StatusCodeHandlerLib|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLi= b/PeiBeepStatusCodeHandlerLib.inf + +[LibraryClasses.DXE_RUNTIME_DRIVER] + StatusCodeHandlerLib|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLi= b/RuntimeDxeBeepStatusCodeHandlerLib.inf + +[LibraryClasses.DXE_SMM_DRIVER] + StatusCodeHandlerLib|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLi= b/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|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/PeiBeepSta= tusCodeHandlerLib.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|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/RuntimeDxe= BeepStatusCodeHandlerLib.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|BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/SmmBeepSta= tusCodeHandlerLib.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 (#85844): https://edk2.groups.io/g/devel/message/85844 Mute This Topic: https://groups.io/mt/88549766/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 Tue May 7 00:53:22 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+85845+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+85845+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641273; cv=none; d=zohomail.com; s=zohoarc; b=j+unhBJ0IYGeznCzhErO83i0IfebcsgKIWP/2NRDSjy2TcIoG1fdZMfF3LdRNARAG03GWh5gi9SmlJvCLLspEHWRvDOefqCpQDyl8Pw8r5GW56g+8YgbUjAADMPG3Uk6NTO+R2SZAZiSwtt3TpJFldXF8mP/yD5X07F339HZAw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641273; 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=hjy4SsA/9mzqiwyI//rHoQp8gW169fHGppuK6NvVVHw=; b=GwwpuHPCaAti+wtEYrrPDoS9y39oq49ZjPTKZHldnU6Fy2KcuuOObGmBzWStjz7wO/bapA/iQgZhE2IoAUlgAr0CJsQqIVM/JrSgurizy83f3jHWc3B5B5Y0sU79IwBbnkWghW8MIDZ3eh6d9C94RIYHBhsxbXJ7dVt61xfi0JE= 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+85845+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 1642641273310324.44625553217656; Wed, 19 Jan 2022 17:14:33 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id NwQ2YY1788612xsRnpqYeb6X; Wed, 19 Jan 2022 17:14:32 -0800 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web09.5747.1642641267930444426 for ; Wed, 19 Jan 2022 17:14:29 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="269638486" X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="269638486" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:27 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559792" 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; 19 Jan 2022 17:14:26 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Sai Chaganty , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V2 02/14] SmbiosFeaturePkg: Use MinPlatformPkg build include files Date: Wed, 19 Jan 2022 17:13:57 -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: 3mu5cCSaICInBGzNoIxe3Ew1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641272; bh=va/PUW4RbnWn9+Rgg859KIiNloBxwesRiK8zL+qnw6M=; h=Cc:Date:From:Reply-To:Subject:To; b=qsDLtRL13vWWr5q+5JQ+SPWZ/qy/j2odpbl/TEd/I+ZtJDtl8CcfFmw//ddBrmKxW0j c4V2AVBF30YrXh1qvXtVOgbBXyLXDhpss5XDa/OcoG6LY0Xclhi9igmB+ey4TkgCX3Qha rtd/NMOTbTbJ4TnJMlvcT6ol6D3zkxOlles= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641274605100014 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 (#85845): https://edk2.groups.io/g/devel/message/85845 Mute This Topic: https://groups.io/mt/88549767/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 Tue May 7 00:53:22 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+85846+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+85846+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641273; cv=none; d=zohomail.com; s=zohoarc; b=f172GMSShfwPuK4SPSGsW004WDv9DPCxADtMMDNMPrZBawN/OVRJ/FENtdjif0KsT5uQyyHd2aIK88r9qXwz+7hnJ66zV8dEgpLIcjwfoefyNAPp3ZM1YEyI1pOveWe1R8JjyEVzdpZbvtTwa4t+ZFQ8VFnhu1YV+lwkWUKukIo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641273; 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=stVuSuCv+GeL2IPiqy8hFN5qGznBY7GQMW+ZPHXPKZA=; b=QoD3TlEQV+PpcEBMnA9+HBIu67FH7ckkDy1JsreOJ42GUHjfG102frhqIh2POqntERxoNy1890Ico7RZEgMU9dLfy5Je/4okw4ELbZ5sR3CtA4klx3Tgdtysi83vsaA4hgAcYuMua2DIl8SG4JsDyKiEUSYqOtcQTLOQF540Jf8= 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+85846+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 1642641273569368.88354852338364; Wed, 19 Jan 2022 17:14:33 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Yn1nYY1788612xxjbUKZlZqn; Wed, 19 Jan 2022 17:14:33 -0800 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.5671.1642641268438975674 for ; Wed, 19 Jan 2022 17:14:29 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="269638488" X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="269638488" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:27 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559795" 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; 19 Jan 2022 17:14:26 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Liming Gao , Dandan Bi Subject: [edk2-devel][edk2-platforms][PATCH V2 03/14] UserAuthFeaturePkg: Fix all relative package paths Date: Wed, 19 Jan 2022 17:13:58 -0800 Message-Id: <31c523b309da723a18cdbb1e4e368a95d0bd296c.1642640106.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: 8VmgkY3mdSOjGTMDsR8gf9Qfx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641273; bh=a4PyKyRRiY10Q4Oc5mqq7e4Luub+4Q1uPWvv7nrcxyo=; h=Cc:Date:From:Reply-To:Subject:To; b=htzzqDhzWryYHu2hiphmT8+Pl4T0xMMPnzftgeclywaJ3leBqpPOerUT6S5vgZO0a8K KaA24xXsNqKqBKDwrBGysDvD2LGtgvcfgN8OdpEWOEnzKaDKLrWn2Z6pFHKUqwa4GrA2D Gzy4IKzeExuULHXMRat2d4jV2gyZbelkgYc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641274669100016 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 (#85846): https://edk2.groups.io/g/devel/message/85846 Mute This Topic: https://groups.io/mt/88549768/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 Tue May 7 00:53:22 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+85848+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+85848+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641274; cv=none; d=zohomail.com; s=zohoarc; b=HwKHwq3f/x9V53TX//sw6iS8XzsGUxN22+VMFggmKZ+rYSQeD0LTAEKn2m/lsRw51vhoMBNs0HGla3/2TkRx4sYiJCgH1ZjWaykep3m7CF2148WbJkPW0r6wYdomieu/6utwESAgZMBPyfT72a16BgMIgIj1qtlvQk4hvQZnyts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641274; 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=WuNTC1rz2ke4RmMjZDb0ESii30ix/1QkDSbT/T4aP78=; b=fhJh1zcF6nBkRbfR8dkfUM0JUaZeT2soTFDchdaJODUtB7B75BH9b2KtD4IUgNZdDJ9RpdYszO7Rb9XRIJFJYRRbt21dnSQskTM9VO2TCNqLvDbwv6JIuQZB3Mn32w0s9R5QQIdBH8qfcFObQoLvc9YiZ2WQ1f3Qa6qhCvHTCbU= 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+85848+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 1642641274052307.95476320048124; Wed, 19 Jan 2022 17:14:34 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id QGTxYY1788612xogD6B2u8j4; Wed, 19 Jan 2022 17:14:33 -0800 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web09.5747.1642641267930444426 for ; Wed, 19 Jan 2022 17:14:29 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="269638490" X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="269638490" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:27 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559799" 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; 19 Jan 2022 17:14:26 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Dandan Bi , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V2 04/14] UserAuthFeaturePkg: Use MinPlatformPkg build include files Date: Wed, 19 Jan 2022 17:13:59 -0800 Message-Id: <84003e8e42c165fce53efa3b8bf953d835ffdeed.1642640106.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: iHC4DCGgXA5wYks6Yjy5394hx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641273; bh=JItp6SVq0jNU1Q5g3HjLo5tic1pL6cl7htXKtl7GzFU=; h=Cc:Date:From:Reply-To:Subject:To; b=bPHrpXj5U2RzM2JrXRj0ptot658EQHTzxUApSTc/f0eKfBrkktxFKxGRIIUd/uknJa1 P65kq4kF+LIiJESUQNFbXT+IOC9G1s/Gs+SA9F8LAGpiTXt8slw6Ndv14vh/BjeWiNSA9 wuHxujGlfdCgGMXh0lD7GhxBuPa99feAHhc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641274709100019 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 (#85848): https://edk2.groups.io/g/devel/message/85848 Mute This Topic: https://groups.io/mt/88549770/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 Tue May 7 00:53:22 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+85849+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+85849+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641275; cv=none; d=zohomail.com; s=zohoarc; b=TvOSXE/PgOEXsmf7/R8ovF2CsCf69qj9iTa0JEO97tQPxLenUN/P1Wv0xVQZ1nC8UV/JFyhn12sojZDrzQOzlPBNUmDjfUo1/ogQafh59z2V58pI7CQCcKpeNqGpFGkoKvEJyBTQg+AoswkDP4Db4rRlItESScl0oxuVr67qAlU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641275; 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=8DRZPcQG83/iy2eQ2QQcu9rk8qGdVD8MOvD/8VIl6kA=; b=a4s4llGqf+kvM2qF/XRIkgBhe6CFjLaNAHA7GpXtjJkIaKQB9+Q7/9DgdM2Nynd3Vxfz9ahpstRdpqPSLbFH7B+5BAM/p1Nd7R1x6qlH7WqJHd8qJEVyINw1zynBZwgSDmpxQ2MfRTrHE1qYS5tmz0gxYAEo3GFRcY+95rAaC5g= 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+85849+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 1642641275364616.6069674539007; Wed, 19 Jan 2022 17:14:35 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id veoJYY1788612xUwwYZeoQeR; Wed, 19 Jan 2022 17:14:35 -0800 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.5671.1642641268438975674 for ; Wed, 19 Jan 2022 17:14:29 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="269638492" X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="269638492" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:27 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559803" 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; 19 Jan 2022 17:14:26 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Liming Gao , Dandan Bi Subject: [edk2-devel][edk2-platforms][PATCH V2 05/14] VirtualKeyboardFeaturePkg: Fix all relative package paths Date: Wed, 19 Jan 2022 17:14:00 -0800 Message-Id: <311faf4ff09f095b6338b3c3086fdb3ebbccd722.1642640106.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: I4C1AnUZR9MhsLFgfYUchlGJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641275; bh=bgJZi4hy3vZ4WnmODMs4KklyaoARj4pmTFn33Lyrbbk=; h=Cc:Date:From:Reply-To:Subject:To; b=fKT+5+4HiQS3Ggs3nIuOQGJoc7UW7y0FKdZPmxjEHn6gmV9LmmteJxYU5rlckA7cqIK vkaoQ8AAO+WeiAEwx7XyHwwuUyEoWMLgWTE17VI0dUmR67hefBgyBX5K2Obc9KBRNGpSB AT5gdOGM+WHNFgR+7CS7YySbD1CVwWi1L5w= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641276833100026 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 (#85849): https://edk2.groups.io/g/devel/message/85849 Mute This Topic: https://groups.io/mt/88549771/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 Tue May 7 00:53:22 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+85851+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+85851+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641276; cv=none; d=zohomail.com; s=zohoarc; b=L+J0Mi+pHhWwOW8BmGWbYStiNSTTTqp3kuYB28hhMm+2NbZYzW9PURUTwEgSUibr7PwxXeW9zIfoAAnpc6+Rk3PT8kKtnYWp78YZ6RrsIp4rjdOWm9ZdC1BYvHmniSN3SYrVPp2QwYgc8mYaHAH6Xzfxtqd5DXBMh1ytXxXWsUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641276; 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=A/9bKX9yLrEVHEGyenTSKTKetWeTo1XSmpRosl/a2iA=; b=cNyKzF61/IEVBZu9EaBVjUdowLdwqaiTwTPxDgdzjZv6SBKAKMRi+g5hSSbwCwQvxdd+rIE8zYp+bvLtrN32EoPZLzHgBALW9qxuNGzU5fc6tdvOXR1zKD8jPVl3Gw4MUylr3VD4sR8gWcCrpsq81GV8+WcB0t+HNEdSVHeMUiE= 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+85851+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 1642641276446582.4791187191802; Wed, 19 Jan 2022 17:14:36 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id qh2yYY1788612xHGMY0qIVgd; Wed, 19 Jan 2022 17:14:36 -0800 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web09.5748.1642641269815508410 for ; Wed, 19 Jan 2022 17:14:29 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="269638495" X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="269638495" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:27 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559807" 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; 19 Jan 2022 17:14:27 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Dandan Bi , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V2 06/14] VirtualKeyboardFeaturePkg: Use MinPlatformPkg build include files Date: Wed, 19 Jan 2022 17:14:01 -0800 Message-Id: <8c60b65684b6c81d1e56f6cb010252b8d7863bc0.1642640106.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: Y1CvHT7lHuvHoRyFYFzyryszx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641276; bh=j+ljp6uZwODYwMfeXgRr5dTG1rvjeKG5k+jftrELq7c=; h=Cc:Date:From:Reply-To:Subject:To; b=vblC6QHTjH+smWrpI5Jzhvnm8eFO5ci5pm5mpAXU6IPWGT+veKTkq9nXeO1X0N2/6oK P2ircWtzzrf5gL4Lgt6cn7CpPoxBeG6llrXMOoK7f5sCSpd8xpMGxU5d/82ZzFHyzhy+P yJzORZi7YR4Ors7979cMwFQR7fkCMYUozL8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641276903100032 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 (#85851): https://edk2.groups.io/g/devel/message/85851 Mute This Topic: https://groups.io/mt/88549773/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 Tue May 7 00:53:22 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+85847+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+85847+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641272; cv=none; d=zohomail.com; s=zohoarc; b=lebHTwP71TPvUM1BmQAOFkz0S8YNKG2dacaIrKZfn3jHe9muq76cDSLETu/3ibjrjUPp4Mk6OjvreKOP8Xx4mOHPgmCDbb5jBexYOrEE6q0ZTSRin1JpMo3XrMDaTmnoEQJkdSWJ9kpRaodPqZAhuVgg89OEKF+3jRKJ39FW4QM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641272; 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=r7OoExq76R4wV4AIvVB2T0N8MALdLyoZxAVPDPlgxOc=; b=NIwkHobB1FSthfWwHjAFa2nq/4kpujx+zktnrIxxKKqymxYgDF4P5fzyjC/3pr75+ba2GMm5NFV7T27qw4x5OLjL1FCCg5H0OZD4PNpw5U9hViUcuNPXhORROQklbPtyE7UHKbPjn/yjbPgaqdBxurLP7xVnkVi2jO70tPM/pkQ= 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+85847+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 1642641272627253.82422517393502; Wed, 19 Jan 2022 17:14:32 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id wyfVYY1788612xzVdt1tNo3p; Wed, 19 Jan 2022 17:14:32 -0800 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.5672.1642641269163839556 for ; Wed, 19 Jan 2022 17:14:29 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="308578749" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="308578749" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:28 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559809" 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; 19 Jan 2022 17:14:27 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Liming Gao , Dandan Bi Subject: [edk2-devel][edk2-platforms][PATCH V2 07/14] VirtualKeyboardFeaturePkg: Add feature enable PCD Date: Wed, 19 Jan 2022 17:14:02 -0800 Message-Id: <9cae8126b4e67c89e35021f4f8b8526dcfed8db0.1642640106.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: 9kGYEdS185yuG7FGfvjo8ZMlx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641272; bh=zQIgi8yy4CHzNalvaDaIm+wFbAwMAECZlMw9iX+rrz4=; h=Cc:Date:From:Reply-To:Subject:To; b=uOfejsG7AVuRjLWfuveoEPETSDAncTs60im74Ce9RYfTe56jvQc0QJAOrgdBAa97nSr F0Tmo1rJJ3ueKWtrS3JbQL8BqAliRfu8zx+1WDT/lXiwWxvBzVkN3Lwv0Vo7RtqwHIJwV bJ9d7PoWnqEeMHh7jx5d/0ABOyMszWm5H9A= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641274484100010 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 (#85847): https://edk2.groups.io/g/devel/message/85847 Mute This Topic: https://groups.io/mt/88549769/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 Tue May 7 00:53:22 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+85853+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+85853+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641276; cv=none; d=zohomail.com; s=zohoarc; b=a76LE8jIHczvyxSNep8QsmZ1JBdbImB49AX/EwHEokcMP+GQO/qAfru/eCE6Q5WCBZNrF0ifFpg5VZI3S+9YXFhMVO9WGpSyoFAtntcFD0sJS4kafuUNm7SWzWhXV2EO6qAYnYP22ipEM6JCHppHD89VYURzzj4Rpa1x+44QA3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641276; 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=OLPdt2+hswzSTfJugqFlJhDPGum6c10VcPD063Kr+Vk=; b=Fca2BgP/7Oja0RAX6VOHwQFa6G32PfgtsKHDrBRg1lgQCew3BJ4mR2BiyZV0pMBnkrotRraPakDdad0voh/hB6ggpjD5CCB0CZT0Z3O1rsqVkESiBLEdeBC4ZFNyBBXh5rKheUDUD9htVCyWK8wdtsDPwyIzuljERFV/Lj9v530= 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+85853+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 1642641276649889.4026434066396; Wed, 19 Jan 2022 17:14:36 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id g1KNYY1788612xKl9CDn6pCT; Wed, 19 Jan 2022 17:14:36 -0800 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web09.5749.1642641269884118835 for ; Wed, 19 Jan 2022 17:14:30 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="308578750" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="308578750" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:28 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559812" 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; 19 Jan 2022 17:14:27 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Dandan Bi , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V2 08/14] LogoFeaturePkg: Use MinPlatformPkg build include files Date: Wed, 19 Jan 2022 17:14:03 -0800 Message-Id: <1ce6eeee47fa0b412c22266d0f02d9ef9353687d.1642640106.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: WAMyxkZxCk7HjmsiYJQVvx2sx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641276; bh=hcJl1nusE3E5IghGdiByYErZgOvWK6J48Osi6ptH9Zk=; h=Cc:Date:From:Reply-To:Subject:To; b=r5u5TJsp65wYERfeW87EvxfItI+YgfhMgCjeYbGUGQqe4nDPDmjaFwF2Q/oH8BJIJ1n qR7ezSmJIjq+UabfQjBspEhSk3u33oPsVcXPBkqiDhT0K+FU8pjxXsaK+/CE9ucGEA//D ry2JyQA3cXSsZ1kKmo6baxU/9pAuoxAesls= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641278982100041 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 (#85853): https://edk2.groups.io/g/devel/message/85853 Mute This Topic: https://groups.io/mt/88549775/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 Tue May 7 00:53:22 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+85854+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+85854+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641277; cv=none; d=zohomail.com; s=zohoarc; b=P4t6cJBGONruBw3r315hoeG05OtZte0Hnq9ymwvqQtaUhsLPe4q9+kwnmY3Zgy9xN+IqmTEkwzmXHbwpWSgb5EFTgFS1qoYvqvlbytlTLDz9BYiQozzsZ5yrWqO8UThGukFnwNZL/EY1pvM+0uQ6jiU8QKi+03GgyE1PMLvwg3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641277; 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=3GQf9TeWj1PE9nTineQe9WsEnV8K8o8iMbQMy1v73dM=; b=KmyUThZjlEA2OU7eiLkSSUdUc6x0P79QB5a+1oc3ThMvRLUJbOBou0E23rSofYrJx6XXwUeCMJPK9eTpuqWfl9wGJOOmwAj9aTWjBEpZR20gckqaQckzeJ2hh6r5d04jwJmToqBJaLEjnxdeEFWknj8cG/EAJUXyEsCSINj3tn4= 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+85854+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 1642641277550272.81330280438385; Wed, 19 Jan 2022 17:14:37 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 0jzzYY1788612xquIkizkwea; Wed, 19 Jan 2022 17:14:37 -0800 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.5672.1642641269163839556 for ; Wed, 19 Jan 2022 17:14:30 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="308578751" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="308578751" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:28 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559816" 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; 19 Jan 2022 17:14:27 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Eric Dong , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V2 09/14] PostCodeDebugFeaturePkg: Complete as an advanced feature Date: Wed, 19 Jan 2022 17:14:04 -0800 Message-Id: <5b15ea9978292eb68d823ad3f086adfea5ca8658.1642640106.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: tgUA8qLmDiyGdNSOvGU5aDTmx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641277; bh=v0wvWSt/d0bQkrJUHzzJTtWxDBmuCG4E3FlhcS/utZ8=; h=Cc:Date:From:Reply-To:Subject:To; b=uyzOWFnteTfGyts+mtrgw7KBBCMJ0AjMzqkm9H2X+WhDGVtxwkf18a0ojO2mCXmZNle AX4jVLs0g/THj0PpKev2jn67xzVl7nYuFlq9tbUQpz7CkGu92/XWuMcx+rBPe/WsMXaoI Vk+3MWnHgWc42K8qcssY3aXKcqLYxN9C8B8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641279180100046 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 Reviewed-by: Nate DeSimone --- 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 (#85854): https://edk2.groups.io/g/devel/message/85854 Mute This Topic: https://groups.io/mt/88549776/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 Tue May 7 00:53:22 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+85850+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+85850+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641275; cv=none; d=zohomail.com; s=zohoarc; b=YIIXKlfL0qn4NlbZ9V9cktDw+isRVyJFMhNMCw67A6lOBG5JxY6AMqOL0oR4rFOprKOn1dTsbfbNzzhsNIctmh6BFISnMvo6cIbo/TZYgSExyI9jA8j2kEZ/JTUCY1LB9S7hMDk4EEDVnT+qy6ayK5W1dU1YqW34eEJyApYEgTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641275; 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=0F0im+fT4Ka2Jq+2AU0NPK8WHhMtAbEPXi8GSAwUiyo=; b=JuEP2Fuo2+1ukgN31owdiFwS3wPnKV4M2W0354YBEJfa4rCJuTVE+ywmdh5lPK2+bq8ARMFqYm61vH7n/Gt8t6NhBLAdphXYHgQH46hcIt6Nmyy6o2hUgXuN37jXjZZ3jEQmXvR40W2wZlqzE7pTX6CRJhQeQ4UCsgQU4nzfU8Y= 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+85850+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 1642641275920321.6476760635841; Wed, 19 Jan 2022 17:14:35 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 3SUCYY1788612xjejk7lq9kK; Wed, 19 Jan 2022 17:14:35 -0800 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.5672.1642641269163839556 for ; Wed, 19 Jan 2022 17:14:29 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="308578752" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="308578752" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:28 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559819" 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; 19 Jan 2022 17:14:27 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Eric Dong , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V2 10/14] AcpiDebugFeaturePkg: Use MinPlatformPkg build include files Date: Wed, 19 Jan 2022 17:14:05 -0800 Message-Id: <0f1323845c8ecb2c794370bd044dd559684a144f.1642640106.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: ui0ZH7cGgOBo9hS5i3ThSDtBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641275; bh=JVH1YH+kn4Wy0QWCtvqxNEbDKQrjyCE0kAvzEJMRbFY=; h=Cc:Date:From:Reply-To:Subject:To; b=JwnMDR3gOdUrPBNCx3PRECPhIkg762ZQAYwNewkXHflbMv+bCNPcpgsp/92WgJssovB Ic4ND0cIuAnpMVKQUib6GEMQXZDUvQ7l25XPw0AopxNQcW88vAL7orRJJLCXtScUaPJMy +WD41wLgWaikkw5Xa6yO6dknWJw48rJy8SE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641276894100030 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 (#85850): https://edk2.groups.io/g/devel/message/85850 Mute This Topic: https://groups.io/mt/88549772/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 Tue May 7 00:53:22 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+85852+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+85852+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641274; cv=none; d=zohomail.com; s=zohoarc; b=LmTNvF76yfVoHDuakC+XRb3FbmymVZvPUVdmXdkAi2U4dMNHHj+DmvJh/pAxFxEi8rRGJAsH/5dydA/3X0VFhcId1kP7I3UjmK0QHB2RPi1HHSGdHsz8VuS2MJfHlD6pQ7EVfMJ095vK5FMvqIuuxQ8O8LtsF4hjebvmbRs5TnQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641274; 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=lowL2qcmM7nr1uH/tp5qsK1RVqbvF3U/64F4i/jMsTw=; b=H0iG8isB7TjjUpriCPnh19vUny5cub1wRSK2opevS6XOdn1dKlWybVrpxZf9bZQccnBPPsziMuQ7J/SsmlcvJEjptiIHeYHglw3U8tw1C12PorQ6IotXT/FJV2tgBoaJrMnJ2FVmYlpeda8hukuKvgwdbUD7/E7IKM3QWmWmKis= 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+85852+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 1642641274829372.7030204739625; Wed, 19 Jan 2022 17:14:34 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id ERmSYY1788612x1Nzqlu2zsZ; Wed, 19 Jan 2022 17:14:34 -0800 X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web09.5747.1642641267930444426 for ; Wed, 19 Jan 2022 17:14:29 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="269638497" X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="269638497" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:28 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559822" 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; 19 Jan 2022 17:14:27 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Eric Dong , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V2 11/14] Usb3DebugFeaturePkg: Align with feature design guidelines Date: Wed, 19 Jan 2022 17:14:06 -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: PlJPfXnek7wmvgIrXM5f2nxcx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641274; bh=4vWGNMfm4juuvWXJG9obSpuwj277QsZBeJHmhCi/nuc=; h=Cc:Date:From:Reply-To:Subject:To; b=I29Flz9xaqcfkmpukE3o0DWOapiroPNDPdEsS0kSZL4lyN8qUO1HlZUg4Kj18kugwwS 5lDsVGTng0fDT+RZFV+cldYPa/Q9GXW0vykgMLlGWUY9DWXtWA2gxJtxKb9+W2bzjEon4 qi0kqD0RsMSZfQFyGEEfVWdomkQTe55phPo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641276839100028 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 Reviewed-by: Nate DeSimone --- 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..2dc48d637b 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] + Usb3DebugPortParamLib|Usb3DebugFeaturePkg/Library/Usb3DebugPortParamLibP= cd/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 (#85852): https://edk2.groups.io/g/devel/message/85852 Mute This Topic: https://groups.io/mt/88549774/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 Tue May 7 00:53:22 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+85856+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+85856+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641278; cv=none; d=zohomail.com; s=zohoarc; b=b4n1v5w4WCN4Bj1WtXsDXaTfGOKGAysNBuO8b1m4tugo9lEy8WJb3/s5dxinkmgl5uveR0vlf6BOQZhBS1jqBwOzD1edi/hoH4ljguBse7yYfKiuqcTLTwxm3Sj5IA9V5IoLBFXkpfoOwaKCuId6pkLaktWHu9AHdsNX+0Xrxkg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641278; 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=mUJr+BfbdJM1Em5vls+6RLHxcvpma1zGAOGNqct3s7U=; b=EBfAeNcs/Hf1ItPv6jxGG3iQyyNS/+GcjPgjt6VHlwPnsns30IpNqmYfq7RJUNBCHFZ1VnQcOfDVnfroNe9dXTf+UC3m50KeyIHqHvo4vM7Lvk449ZSHmvJXY8VLCXQZeO7/ODaAQWTgP7THGcJdPWuXGt8oX7mBJN719XRZ384= 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+85856+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 1642641278091535.7625355313893; Wed, 19 Jan 2022 17:14:38 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5QwXYY1788612xmZQK9lXtIU; Wed, 19 Jan 2022 17:14:37 -0800 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web09.5749.1642641269884118835 for ; Wed, 19 Jan 2022 17:14:30 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="308578753" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="308578753" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:28 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559827" 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; 19 Jan 2022 17:14:27 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Sai Chaganty , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V2 12/14] AdvancedFeaturePkg: Add missing features Date: Wed, 19 Jan 2022 17:14:07 -0800 Message-Id: <221e162707c2d77b8d58f71f66ad68a1684db551.1642640106.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: NxkHDfdA4tB0biTZrfhXNrGwx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641277; bh=HINEQymAGGCcP3Tal8FeMjxGhmMZh8aHfnBbtaI3ziM=; h=Cc:Date:From:Reply-To:Subject:To; b=Di13R5KgBmfhh5QLafWfTLigA/CrCdpQHfw/OjWeaMO+9DScuYd9aZGyt3i9d2KvWCn McBbqLqc27qTeNux7UaSMVfKSelojlYxnE8ANr42sysjInbAPuUSCGtPpxBuGtbpyO4Ln 0KyGt5Iw/Lh4AskUdcvz6gYn8a01sCcx0FA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641279303100053 Content-Type: text/plain; charset="utf-8" The AdvancedFeaturePkg is supposed to include all features. Add Beep Debug feature to include DSC and FDF. Order features based on their domains. Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 66 +++= +++++++++++++---- Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc | 36 +++= +++++--- Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc | 64 +++= ++++++++++++---- Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf | 36 +++= +++++--- Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf | 36 +++= +++++--- Features/Intel/Readme.md | 49 +++= +++++++----- 6 files changed, 219 insertions(+), 68 deletions(-) diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Fea= tures/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc index 0c7a29cc75..02636da916 100644 --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc @@ -36,7 +36,6 @@ =20 !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc =20 - ##########################################################################= ###### # # Advanced Feature Enable section - all advanced features are enabling for= the @@ -44,26 +43,71 @@ # ##########################################################################= ###### [PcdsFeatureFlag] - gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable = |TRUE - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable = |TRUE - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable = |TRUE - gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable = |TRUE - gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable = |TRUE - gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable = |TRUE - gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = |TRUE - gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable = |TRUE - gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE + # + # Debugging features + # + gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable = |TRUE + gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable = |TRUE + gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable = |TRUE + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable = |TRUE + + # + # Network features + # + gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable = |TRUE + + # + # OutOfBandManagement features + # + gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable = |TRUE + gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable = |TRUE + + # + # PowerManagement features + # + gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable = |TRUE + + # + # SystemInformation features + # + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable = |TRUE + + # + # UserInterface features + # + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable = |TRUE + gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = |TRUE + gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable= |TRUE + +# +# PCD that are required to be set by the build target should be configured= here for test purposes +# These settings are only for the purposes of buildings, boards should fol= low instructions in Readme files. +# + +[PcdsFixedAtBuild] + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|1 + +[PcdsFeatureFlag] + # + # MinPlatform common include currently required PCD + # gMinPlatformPkgTokenSpaceGuid.PcdSmiHandlerProfileEnable = |FALSE gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable = |FALSE gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable = |FALSE =20 # -# Include common library +# Include common libraries # !include MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc !include MinPlatformPkg/Include/Dsc/CorePeiLib.dsc !include MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc =20 +# +# Libraries required to be specified by the build target +# +[LibraryClasses.Common] + PlatformHookLib|MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatfor= mHookLibNull.inf # Required by BeepDebugFeature + # # This package builds all advanced features. # diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc= b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc index 874b8ce7db..2b36938df6 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc @@ -11,51 +11,67 @@ ## =20 # -# Debug Advanced Features +# Debugging features # !if gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable =3D=3D TR= UE !include AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc !endif =20 +!if gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable =3D=3D TR= UE + !include BeepDebugFeaturePkg/Include/BeepDebugFeature.dsc +!endif + +!if gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable = =3D=3D TRUE + !include PostCodeDebugFeaturePkg/Include/PostCodeDebugFeature.dsc +!endif + !if gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable =3D=3D TR= UE !include Usb3DebugFeaturePkg/Include/Usb3DebugFeature.dsc !endif =20 # -# Network Advanced Features +# Network features # !if gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable =3D=3D TRUE !include NetworkFeaturePkg/Include/NetworkFeature.dsc !endif =20 # -# Out-of-Band Management Advanced Features +# OutOfBandManagement features # !if gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable =3D=3D TRUE !include IpmiFeaturePkg/Include/IpmiFeature.dsc !endif =20 +!if gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable =3D=3D TRUE + !include SpcrFeaturePkg/Include/SpcrFeature.dsc +!endif + # -# Power Management Advanced Features +# PowerManagement features # !if gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable =3D=3D TRUE !include S3FeaturePkg/Include/S3Feature.dsc !endif =20 # -# System Information Advanced Features +# SystemInformation features # !if gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable =3D=3D TRUE !include SmbiosFeaturePkg/Include/SmbiosFeature.dsc !endif =20 # -# User Interface Advanced Features +# UserInterface features # -!if gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = =3D=3D TRUE - !include UserAuthFeaturePkg/Include/UserAuthFeature.dsc -!endif - !if gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable =3D=3D TRUE !include LogoFeaturePkg/Include/LogoFeature.dsc !endif + +!if gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = =3D=3D TRUE + !include UserAuthFeaturePkg/Include/UserAuthFeature.dsc +!endif + +!if gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnab= le =3D=3D TRUE + !include VirtualKeyboardFeaturePkg/Include/VirtualKeyboardFeature.dsc +!endif diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.= dsc b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc index ad248de800..e214175eda 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc @@ -16,28 +16,70 @@ # [Packages] MdePkg/MdePkg.dec + + # + # Debugging features + # AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec + BeepDebugFeaturePkg/BeepDebugFeaturePkg.dec + PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dec Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dec + + # + # Networking features + # NetworkFeaturePkg/NetworkFeaturePkg.dec + + # + # OutOfBandManagement features + # IpmiFeaturePkg/IpmiFeaturePkg.dec + SpcrFeaturePkg/SpcrFeaturePkg.dec + + # + # PowerManagement features + # S3FeaturePkg/S3FeaturePkg.dec + + # + # SystemInformation features + # SmbiosFeaturePkg/SmbiosFeaturePkg.dec - UserAuthFeaturePkg/UserAuthFeaturePkg.dec + + # + # UserInterface features + # LogoFeaturePkg/LogoFeaturePkg.dec - BeepDebugFeaturePkg/BeepDebugFeaturePkg.dec - PostCodeDebugFeaturePkg/PostCodeDebugFeaturePkg.dec + UserAuthFeaturePkg/UserAuthFeaturePkg.dec + VirtualKeyboardFeaturePkg/VirtualKeyboardFeaturePkg.dec =20 # # The section below sets all PCDs to FALSE in this DSC file so the feature= is not enabled by default. # Board can set PCDs to TRUE in its DSC file to enable a subset of advance= d features # [PcdsFeatureFlag] - gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable = |FALSE - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable = |FALSE - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable = |FALSE - gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable = |FALSE - gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable = |FALSE - gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable = |FALSE - gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = |FALSE - gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable = |FALSE + gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable = |FALSE + gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable = |FALSE + gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable = |FALSE + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable = |FALSE + + gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable = |FALSE + + gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable = |FALSE + gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable = |FALSE + + gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable = |FALSE + + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable = |FALSE + + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable = |FALSE + gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = |FALSE + gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable= |FALSE + +# +# There seems to be some build parsing odd behavior that requires this PCD= to be specified even though +# the *.fdf that consumes it is dependent on the feature flag. +# This section is to ensure that boards have these PCD instantiated. +# +[PcdsFeatureFlag] gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE diff --git a/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf b/Fea= tures/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf index e710fe7f01..99089f9a7b 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf +++ b/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf @@ -12,51 +12,67 @@ ## =20 # -# Debug Advanced Features +# Debugging features # !if gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable =3D=3D TR= UE !include AcpiDebugFeaturePkg/Include/PostMemory.fdf !endif =20 +!if gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable =3D=3D TR= UE + !include BeepDebugFeaturePkg/Include/PostMemory.fdf +!endif + +!if gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable = =3D=3D TRUE + !include PostCodeDebugFeaturePkg/Include/PostMemory.fdf +!endif + !if gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable =3D=3D TR= UE !include Usb3DebugFeaturePkg/Include/PostMemory.fdf !endif =20 # -# Network Advanced Features +# Network features # !if gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable =3D=3D TRUE !include NetworkFeaturePkg/Include/PostMemory.fdf !endif =20 # -# Out-of-Band Management Advanced Features +# OutOfBandManagement features # !if gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable =3D=3D TRUE !include IpmiFeaturePkg/Include/PostMemory.fdf !endif =20 +!if gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable =3D=3D TRUE + !include SpcrFeaturePkg/Include/PostMemory.fdf +!endif + # -# Power Management Advanced Features +# PowerManagement features # !if gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable =3D=3D TRUE !include S3FeaturePkg/Include/PostMemory.fdf !endif =20 # -# System Information Advanced Features +# SystemInformation features # !if gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable =3D=3D TRUE !include SmbiosFeaturePkg/Include/PostMemory.fdf !endif =20 # -# User Interface Advanced Features +# UserInterface features # -!if gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = =3D=3D TRUE - !include UserAuthFeaturePkg/Include/PostMemory.fdf -!endif - !if gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable =3D=3D TRUE !include LogoFeaturePkg/Include/PostMemory.fdf !endif + +!if gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = =3D=3D TRUE + !include UserAuthFeaturePkg/Include/PostMemory.fdf +!endif + +!if gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnab= le =3D=3D TRUE + !include VirtualKeyboardFeaturePkg/Include/PostMemory.fdf +!endif diff --git a/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf b/Feat= ures/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf index 177aafc1ec..1db258446a 100644 --- a/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf +++ b/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf @@ -12,51 +12,67 @@ ## =20 # -# Debug Advanced Features +# Debugging features # !if gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable =3D=3D TR= UE !include AcpiDebugFeaturePkg/Include/PreMemory.fdf !endif =20 +!if gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable =3D=3D TR= UE + !include BeepDebugFeaturePkg/Include/PreMemory.fdf +!endif + +!if gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable = =3D=3D TRUE + !include PostCodeDebugFeaturePkg/Include/PreMemory.fdf +!endif + !if gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable =3D=3D TR= UE !include Usb3DebugFeaturePkg/Include/PreMemory.fdf !endif =20 # -# Network Advanced Features +# Network features # !if gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable =3D=3D TRUE !include NetworkFeaturePkg/Include/PreMemory.fdf !endif =20 # -# Out-of-Band Management Advanced Features +# OutOfBandManagement features # !if gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable =3D=3D TRUE !include IpmiFeaturePkg/Include/PreMemory.fdf !endif =20 +!if gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable =3D=3D TRUE + !include SpcrFeaturePkg/Include/PreMemory.fdf +!endif + # -# Power Management Advanced Features +# PowerManagement features # !if gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable =3D=3D TRUE !include S3FeaturePkg/Include/PreMemory.fdf !endif =20 # -# System Information Advanced Features +# SystemInformation features # !if gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable =3D=3D TRUE !include SmbiosFeaturePkg/Include/PreMemory.fdf !endif =20 # -# User Interface Advanced Features +# UserInterface features # -!if gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = =3D=3D TRUE - !include UserAuthFeaturePkg/Include/PreMemory.fdf -!endif - !if gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable =3D=3D TRUE !include LogoFeaturePkg/Include/PreMemory.fdf !endif + +!if gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = =3D=3D TRUE + !include UserAuthFeaturePkg/Include/PreMemory.fdf +!endif + +!if gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnab= le =3D=3D TRUE + !include VirtualKeyboardFeaturePkg/Include/PreMemory.fdf +!endif diff --git a/Features/Intel/Readme.md b/Features/Intel/Readme.md index 1a03a4c0d2..cf5ef7b260 100644 --- a/Features/Intel/Readme.md +++ b/Features/Intel/Readme.md @@ -195,32 +195,47 @@ At a minimum, an advanced feature must consist of the= following elements: 6. Add the source code for the advanced feature. * If the feature is large it is recommended to add libraries in one pa= tch and then modules in a following patch. =20 -7. Update the feature DSC file. This file is in `XxxFeaturePkg/Include/Xxx= Feature.dsc`. +7. Update the feature DSC include file. This file is in `XxxFeaturePkg/Inc= lude/XxxFeature.dsc`. * In most cases, `XxxFeaturePkg/XxxFeaturePkg.dsc` should just `!inclu= de XxxFeaturePkg/Include/XxxFeature.dsc`. + * This file should not duplicate core content from `MinPlatformPkg/Inc= lude/Dsc` except where a change is required by + the feature. =20 -8. Update the feature FDF files. These files are `XxxFeaturePkg/Include/Pr= eMemory.fdf` and +8. Update the feature FDF include files. These files are `XxxFeaturePkg/In= clude/PreMemory.fdf` and `XxxFeaturePkg/Include/PostMemory.fdf`. * Each file should contain the feature pre-memory modules and post-mem= ory modules respectively. =20 9. Build the advanced feature package to ensure the build is successful: - From the workspace root: - 1. cd edk2-platforms/edk2 - 2. Execute edksetup.bat (Windows) or edksetup.sh (Linux). - 3. Verify the "WORKSPACE" environment variable is set to the edk2 dire= ctory in your workspace. - 4. Set the "PACKAGES_PATH" environment variable to include the edk2-pl= atforms/Platform/Intel, edk2-platforms/Silicon/Intel, - and edk2-platforms/Features/Intel directories. + 1. Verify the "WORKSPACE" environment variable is set to the parent of= edk2 and edk2-platforms directory in your + workspace. + 2. Set the "PACKAGES_PATH" environment variable to include the edk2, e= dk2-platforms/Platform/Intel, + edk2-platforms/Silicon/Intel, and edk2-platforms/Features/Intel dir= ectories. * Windows example: - * set PACKAGES_PATH=3Dc:\Edk2Workspace\edk2-platforms\Platform\In= tel; - c:\Edk2Workspace\edk2-platforms\Silicon\Intel; - c:\Edk2Workspace\edk2-platforms\Features\Intel + * set PACKAGES_PATH=3D%WORKSPACE%\edk2; + %WORKSPACE%\edk2-platforms\Platform\Intel; + %WORKSPACE%\edk2-platforms\Silicon\Intel; + %WORKSPACE%\edk2-platforms\Features\Intel; + %WORKSPACE%\edk2-platforms\Features\Intel\Deb= ugging; + %WORKSPACE%\edk2-platforms\Features\Intel\Net= work; + %WORKSPACE%\edk2-platforms\Features\Intel\Out= OfBandManagement; + %WORKSPACE%\edk2-platforms\Features\Intel\Pow= erManagement; + %WORKSPACE%\edk2-platforms\Features\Intel\Sys= temInformation; + %WORKSPACE%\edk2-platforms\Features\Intel\Use= rInterface * Linux example: - * export PACKAGES_PATH=3D~/Edk2Workspace/edk2-platforms/Platform/= Intel: + * export PACKAGES_PATH=3D~Edk2Workspace/edk2: + ~/Edk2Workspace/edk2-platforms/Platform/In= tel: ~/Edk2Workspace/edk2-platforms/Silicon/Int= el: - ~/Edk2Workspace/edk2-platforms/Features/In= tel + ~/Edk2Workspace/edk2-platforms/Features/In= tel: + ~/Edk2Workspace/edk2-platforms/Features/In= tel/Debugging: + ~/Edk2Workspace/edk2-platforms/Features/In= tel/Network: + ~/Edk2Workspace/edk2-platforms/Features/In= tel/OutOfBandManagement: + ~/Edk2Workspace/edk2-platforms/Features/In= tel/PowerManagement: + ~/Edk2Workspace/edk2-platforms/Features/In= tel/SystemInformation: + ~/Edk2Workspace/edk2-platforms/Features/In= tel/UserInterface + 3. cd edk2 + 4. Execute edksetup.bat (Windows) or edksetup.sh (Linux). 5. cd edk2-platforms/Features/Intel - 6. 
build -p FeatureDomainDirectory/XxxFeaturePkg/XxxFeaturePkg.ds=
c -a IA32 -a X64
- + 6. 
build -a IA32 -a X64 -p FeatureDomainDirectory/XxxFeaturePkg/X=
xxFeaturePkg.dsc
*Note:* -a specifies the architecture. Typically IA32 and X64 modul= es are built for 32-bit PEI and 64-bit DXE though build for your specific requirements. =20 @@ -228,11 +243,13 @@ At a minimum, an advanced feature must consist of the= following elements: 1. Add `XxxFeaturePkg/Include/XxxFeature.dsc` to `AdvancedFeatures.dsc` 2. Add `XxxFeaturePkg/Include/PreMemory.fdf` to `AdvancedFeaturePkg/In= clude/PreMemory.fdf` 3. Add `XxxFeaturePkg/Include/PostMemory.fdf` to `AdvancedFeaturePkg/I= nclude/PostMemory.fdf` + 4. Add the `PcdFeatureEnable` to `AdvancedFeaturesPcd.dsc` set to FALSE + 5. Add the `PcdFeatureEnable` to `AdvancedFeaturePkg.dsc` set to TRUE =20 11. Build `AdvancedFeaturePkg` to ensure the build is successful. 1. Follow the steps in step #9 but change the build command to: =20 - 
build -p AdvancedFeaturePkg/AdvancedFeaturePkg.dsc -a IA32 -a X64=
+ 
build  -a IA32 -a X64 -p AdvancedFeaturePkg/AdvancedFeaturePkg.ds=
c
=20 12. Before sending your patch series, ensure the `Readme.md` file in `XxxF= eaturePkg` is completed so others can use it during the feature review. --=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 (#85856): https://edk2.groups.io/g/devel/message/85856 Mute This Topic: https://groups.io/mt/88549778/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 Tue May 7 00:53:22 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+85855+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+85855+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641278; cv=none; d=zohomail.com; s=zohoarc; b=bjwVSMHxwN3bjNYKN2SzsAfPJoa/QING+WODRCvYs+hd5HFELYCZiLNGQ6g3NhKKocm5QWFeTjj8hNnSRT4XKrgv5MDR2XMg4UGrumfcXEKWrDE5R/dAUM354RIrrFjW4gzfj+u11U9uc2n63JPc2tVU5wvNIidAhgQHKJECrqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641278; 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=DkFnir7k8SUyDsFZ7UG5toGbm9WdC+um0snVmmZce18=; b=n8uR5tHUPpuwK/vCr5XV5+tt47snIaDBhpPVBNCgKzqXNK6K405JCl9WeXIeLJw0K2vfEs48pZoMexs1GYOMKa+gRdTRWoHFP1JZd/YIP4fqE1K2ZNq4zU2KvuQoBryDKvwXk1zCbJOvi9krkupXNEJse3Q3K+Wlr/HM+yQy2TY= 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+85855+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 1642641278627266.14520179302815; Wed, 19 Jan 2022 17:14:38 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id gfIAYY1788612x33E3iEV3dw; Wed, 19 Jan 2022 17:14:38 -0800 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.5672.1642641269163839556 for ; Wed, 19 Jan 2022 17:14:30 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="308578754" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="308578754" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:28 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559831" 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; 19 Jan 2022 17:14:27 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Sai Chaganty , Liming Gao Subject: [edk2-devel][edk2-platforms][PATCH V2 13/14] AdvancedFeaturePkg/Build: Add FDF to create FV for all features Date: Wed, 19 Jan 2022 17:14:08 -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: cTshKAKkjbjAND1J6S0fE4oHx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641278; bh=pM55eesmi9V5UHjrqMp0jx+0LVHBGdRXc9RUqdiCF74=; h=Cc:Date:From:Reply-To:Subject:To; b=SxQb8oJXbeQy4YW1H4Atk1MYl4GfhvvdWyFkLNjKMaBB6gXYY54+MUudypSl8KgG/Sa J7jaxOORuc2LwL2Oj59w0+E7+Hif5f9GlRRd29ncUGJvRwGGt30Nz+c/wpHB9jvqB8HgY 1cxLq4ZaGewDD+1Ia1ENheNcQYluSlO3hXk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641279235100050 Content-Type: text/plain; charset="utf-8" This produces three FV and no FD. FvAdvancedPreMemory.fv contains PEIM for pre-memory use. FvAdvancedUncompressed.fv contains post memory PEIM and drivers for DXE and SMM. FvAdvanced.fv contains the compressed FvAdvancedUncompressed.fv in an FV file format as is common practice. These FV are not expected to be used as is, but are needed to test the individual features for things like filename collisions. Some features require build customization so binary reuse is not feasible at this time. Cc: Sai Chaganty Cc: Liming Gao Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc | 1 + Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.fdf | 49 ++++++++++++= ++++++++ 2 files changed, 50 insertions(+) diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Fea= tures/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc index 02636da916..28530b8c67 100644 --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc @@ -29,6 +29,7 @@ SKUID_IDENTIFIER =3D DEFAULT PEI_ARCH =3D IA32 DXE_ARCH =3D X64 + FLASH_DEFINITION =3D AdvancedFeaturePkg/AdvancedFeatu= rePkg.fdf =20 [Packages] MdePkg/MdePkg.dec diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.fdf b/Fea= tures/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.fdf new file mode 100644 index 0000000000..76a02c5d1c --- /dev/null +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.fdf @@ -0,0 +1,49 @@ +## @file +# FDF file generating AdvancedFeature FV for inclusion in a MinPlatform de= sign. +# +# There are three FV produced, FvAdvancedPreMemory.fv, FvAdvancedUncompres= sed.fv, and +# FvAdvanced.fv. The sizes are arbitrary as these are not expected to be = used as is +# in today's usages. Boards will tune FV by selecting or deseleting featu= res and building. +# +# @copyright +# Copyright (C) 2022 Intel Corporation +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +## + +[Defines] + DEFINE UNCOMPRESSED_FV_ADVANCED_FILENAME =3D 6d606b5c-2d45-4705-a700-733= 24306be06 + +[FV.FvAdvancedPreMemory] + !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf + FvNameGuid =3D ea9da344-a7f3-468c-ae84-2d22fc03b28e + + !include AdvancedFeaturePkg/Include/PreMemory.fdf + +[FV.FvAdvancedUncompressed] + !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf + FvNameGuid =3D $(UNCOMPRESSED_FV_ADVANCED_FILENAME) + + !include AdvancedFeaturePkg/Include/PostMemory.fdf + +[FV.FvAdvanced] + !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf + FvNameGuid =3D 445b121d-28d6-4801-8958-8253cf426cf7 + + FILE FV_IMAGE =3D $(UNCOMPRESSED_FV_ADVANCED_FILENAME) { + SECTION GUIDED EE4E5898-3914-4259-9D6E-DC7BD79403CF PROCESSING_REQUIRE= D =3D TRUE { + SECTION FV_IMAGE =3D FvAdvancedUncompressed + } + } + + +##########################################################################= ###### +# +# Rules are use with the [FV] section's module INF type to define +# how an FFS file is created for a given INF file. The following Rule are = the default +# rules for the different module type. User can add the customized rules t= o define the +# content of the FFS file. +# +##########################################################################= ###### + +!include MinPlatformPkg/Include/Fdf/RuleInclude.fdf --=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 (#85855): https://edk2.groups.io/g/devel/message/85855 Mute This Topic: https://groups.io/mt/88549777/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 Tue May 7 00:53:22 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+85857+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+85857+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1642641279; cv=none; d=zohomail.com; s=zohoarc; b=UgI7TJMfZVQ9aHglfhN7z57vxVONn0A3tSaYTU8bCTriwkJ/bDC9joHDTIHy1ssKiB/XOZ+xCnc2HCOXbAiwnQmF/f/YSCRDn3qdklACFjBCPlmijfBfTII+sLPubTVxuLSNPu5ikaTU1bL42TXmOS4YqhZB/b0fhpr01iPsBH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642641279; 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=dMar5N09EXg79CuVkzFx/v0hDH4Y4QSM0xWhJOyeKCk=; b=Zo6XMmvIv6bYkynyeDzBuKLjLMc/P8Xz+reLj4+ljQ8DHWulDz76qX2SjYjekABk1RltJT7pshkOa5CqiE/sRsBpYXLeHs+t7CVVNZzvSaUMHtGGuedf5cu0LcWrX+5diKEiJnpfuQXGeKCrdtxizSe7Gh4FS1CgQriz//N/g6M= 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+85857+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 164264127911961.332896723398676; Wed, 19 Jan 2022 17:14:39 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 46sKYY1788612xR0CK6C4533; Wed, 19 Jan 2022 17:14:38 -0800 X-Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.5672.1642641269163839556 for ; Wed, 19 Jan 2022 17:14:30 -0800 X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="308578755" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="308578755" X-Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 17:14:28 -0800 X-IronPort-AV: E=Sophos;i="5.88,301,1635231600"; d="scan'208";a="532559833" 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; 19 Jan 2022 17:14:27 -0800 From: "Oram, Isaac W" To: devel@edk2.groups.io Cc: Nate DeSimone , Chasel Chiu Subject: [edk2-devel][edk2-platforms][PATCH V2 14/14] WhitleyOpenBoardPkg/Build: Enable Features/Intel features Date: Wed, 19 Jan 2022 17:14:09 -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: dB3LwlGJfoOmouiNY48uoQQUx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1642641278; bh=GE0e971mZRmhts4nQXnw+G7125kPFrl9NOPzoy6gV3M=; h=Cc:Date:From:Reply-To:Subject:To; b=h8Ntv3g5Qt26l0daafnWYqU2njQnVQ3JXBsU+j/oT9gTxhGOub1ITrDHrIY5igE9jws +SkUNdEXegz6jT7zdsTo/vxVP1UdNIhWt/PX/q4pTtNB1baVpXc+FCzGvUs5dKzrpFdt+ RBVIPVDyhCPqcv9saihEK2nFOYYXoX+kklw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1642641281355100059 Content-Type: text/plain; charset="utf-8" This enables Whitley as a test vehicle for features. These are not expected to be fully functional at this time. Specifically UserAuthentication causes a boot failure and the others have only been verified to be built and dispatched, not ported to the Whitley reference platform hardware. Cc: Nate DeSimone Cc: Chasel Chiu Signed-off-by: Isaac Oram Reviewed-by: Nate DeSimone --- Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc | 44 ++++++++++++++++++= ++ Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf | 6 ++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc b/Platform/= Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc index f07b0a8ccf..42680254d1 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc +++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dsc @@ -39,6 +39,50 @@ DEFINE IIO_INSTANCE =3D UnknownCpu !endif =20 +!include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc + +[PcdsFixedAtBuild] + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugPortLibInstance|1 + +[PcdsFeatureFlag] + # + # Debugging features + # + gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable = |FALSE + gBeepDebugFeaturePkgTokenSpaceGuid.PcdBeepDebugFeatureEnable = |FALSE + gPostCodeDebugFeaturePkgTokenSpaceGuid.PcdPostCodeDebugFeatureEnable = |FALSE + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable = |FALSE + + # + # Network features + # + gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable = |FALSE + + # + # OutOfBandManagement features + # + gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable = |FALSE + gSpcrFeaturePkgTokenSpaceGuid.PcdSpcrFeatureEnable = |FALSE + + # + # PowerManagement features + # + gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable = |FALSE + + # + # SystemInformation features + # + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable = |FALSE + + # + # UserInterface features + # + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable = |FALSE + gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = |FALSE + gVirtualKeyboardFeaturePkgTokenSpaceGuid.PcdVirtualKeyboardFeatureEnable= |FALSE + +!include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc + # # Platform On/Off features are defined here # diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf b/Platform/= Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf index 7e2a8b1b9f..45460570d9 100644 --- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf +++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.fdf @@ -84,7 +84,7 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = =3D 0x01000000 SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize =3D 0x0004= 0000 # Size must match WhitleyFspPkg.fdf content SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspMSize =3D 0x0022= 1000 # Size must match WhitleyFspPkg.fdf content SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTSize =3D 0x0000= 6000 # Size must match WhitleyFspPkg.fdf content - SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemorySize =3D 0x0000= 1000 + SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemorySize =3D 0x0001= 0000 SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPreMemorySize =3D gCpPla= tFlashTokenSpaceGuid.PcdFlashFdSecPeiSize - gMinPlatformPkgTokenSpaceGuid.P= cdFlashFvBspSize - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemorySize -= gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspSSize - gMinPlatformPkgTokenSpa= ceGuid.PcdFlashFvFspMSize - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvFspTSiz= e - gMinPlatformPkgTokenSpaceGuid.PcdFlashFvBspPreMemorySize =20 # @@ -481,6 +481,8 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = =3D 0x01000000 !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf FvNameGuid =3D 09f25d44-b2ef-4225-8b2e-e0e094b51775 =20 + !include AdvancedFeaturePkg/Include/PreMemory.fdf + [FV.FvBspPreMemory] !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf FvNameGuid =3D e6c65995-8c2d-4119-a52d-7dbf1acb45a1 @@ -710,6 +712,8 @@ SET gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize = =3D 0x01000000 !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf FvNameGuid =3D 70aeaf57-4997-49ce-a4f7-122980745670 =20 + !include AdvancedFeaturePkg/Include/PostMemory.fdf + [FV.FvAdvanced] !include MinPlatformPkg/Include/Fdf/CommonSpiFvHeaderInfo.fdf FvNameGuid =3D f21ee7a1-53a9-453d-aee3-b6a5c25bada5 --=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 (#85857): https://edk2.groups.io/g/devel/message/85857 Mute This Topic: https://groups.io/mt/88549779/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-