From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.4535.1587642201767632527 for ; Thu, 23 Apr 2020 04:43:21 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: ray.ni@intel.com) IronPort-SDR: sh1pcCPJVLQsz50P0pNxfdnmLJHZpjX3kdAFL+gtEirUGrRMLuvO9G+kRqqnf1MWPtMo5G5lbC NX1HzcCYYWdg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2020 04:43:21 -0700 IronPort-SDR: BiwMCzLN1MIEDdV5Iyol+xW3uVdnp6HHy9momt/5J+JsTP+TZpTp1CjmhcOD1LndDq0qwcbTic sFxV5sg8Krnw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,307,1583222400"; d="scan'208";a="246243919" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga007.fm.intel.com with ESMTP; 23 Apr 2020 04:43:21 -0700 Received: from fmsmsx115.amr.corp.intel.com (10.18.116.19) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 23 Apr 2020 04:42:58 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx115.amr.corp.intel.com (10.18.116.19) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 23 Apr 2020 04:42:58 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.225]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.22]) with mapi id 14.03.0439.000; Thu, 23 Apr 2020 19:42:55 +0800 From: "Ni, Ray" To: "Luo, Heng" , "devel@edk2.groups.io" CC: Michael Kubacki , "Gao, Liming" , "Dong, Eric" Subject: Re: [PATCH 1/2] Features/Intel/AdvancedFeaturePkg: Remove temporary build workaround Thread-Topic: [PATCH 1/2] Features/Intel/AdvancedFeaturePkg: Remove temporary build workaround Thread-Index: AQHWGUs/TgW9AIgwI0qjFRH+h+i4b6iGlfdQ Date: Thu, 23 Apr 2020 11:42:54 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C50A9E0@SHSMSX104.ccr.corp.intel.com> References: <20200423084258.1100-1-heng.luo@intel.com> <20200423084258.1100-2-heng.luo@intel.com> In-Reply-To: <20200423084258.1100-2-heng.luo@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Heng, Any reason to create a separate Pcd.dsc file? > -----Original Message----- > From: Luo, Heng > Sent: Thursday, April 23, 2020 4:43 PM > To: devel@edk2.groups.io > Cc: Michael Kubacki ; Gao, Liming ; Dong, Eric > ; Ni, Ray > Subject: [PATCH 1/2] Features/Intel/AdvancedFeaturePkg: Remove temporary = build workaround >=20 > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2688 >=20 > Remove Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround, > Add Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc > to support Feature PCDs. >=20 > Cc: Michael Kubacki > Cc: Liming Gao > Cc: Eric Dong > Cc: Ray Ni > Signed-off-by: Heng Luo > --- > Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc = | 2 +- > Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc = | 41 > +++++++++++++++++++++++++++++++++++++++++ > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuil= dWorkaround.c | 31 --------------------------- > ---- > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuil= dWorkaround.dsc | 76 -------------------------- > -------------------------------------------------- > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuil= dWorkaround.inf | 60 --------------------------- > --------------------------------- > 5 files changed, 42 insertions(+), 168 deletions(-) >=20 > diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc > b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc > index ea879680ba..e509ef3e1b 100644 > --- a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc > +++ b/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc > @@ -30,7 +30,7 @@ > PEI_ARCH =3D IA32 >=20 > DXE_ARCH =3D X64 >=20 >=20 >=20 > -!include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorka= round.dsc >=20 > +!include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc >=20 >=20 >=20 > ########################################################################= ######## >=20 > # >=20 > diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPc= d.dsc > b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc > new file mode 100644 > index 0000000000..2eacec18a0 > --- /dev/null > +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc > @@ -0,0 +1,41 @@ > +## @file >=20 > +# DSC file for defining Pcd of advanced features. >=20 > +# >=20 > +# This file is intended to be included into another package so advanced= features >=20 > +# can be conditionally built by enabling the respective feature via its= FeaturePCD. >=20 > +# >=20 > +# Copyright (c) 2020, Intel Corporation. All rights reserved.
>=20 > +# >=20 > +# SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > +# >=20 > +## >=20 > + >=20 > +# >=20 > +# The section references the package DEC files, >=20 > +# it allow a FeaturePCD to be used in a conditional statement >=20 > +# >=20 > +[Packages] >=20 > + MdePkg/MdePkg.dec >=20 > + AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec >=20 > + Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dec >=20 > + NetworkFeaturePkg/NetworkFeaturePkg.dec >=20 > + IpmiFeaturePkg/IpmiFeaturePkg.dec >=20 > + S3FeaturePkg/S3FeaturePkg.dec >=20 > + SmbiosFeaturePkg/SmbiosFeaturePkg.dec >=20 > + UserAuthFeaturePkg/UserAuthFeaturePkg.dec >=20 > + LogoFeaturePkg/LogoFeaturePkg.dec >=20 > + >=20 > +# >=20 > +# The section below sets all PCDs to FALSE in this DSC file so the featu= re is not enabled by default. >=20 > +# Board can set PCDs to TRUE in its DSC file to enable a subset of advan= ced features >=20 > +# >=20 > +[PcdsFeatureFlag] >=20 > + gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable = |FALSE >=20 > + gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable = |FALSE >=20 > + gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable = |FALSE >=20 > + gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable = |FALSE >=20 > + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable = |FALSE >=20 > + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable = |FALSE >=20 > + gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = |FALSE >=20 > + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable = |FALSE >=20 > + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE >=20 > diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/T= emporaryBuildWorkaround.c > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBui= ldWorkaround.c > deleted file mode 100644 > index 2cd91b06f0..0000000000 > --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporar= yBuildWorkaround.c > +++ /dev/null > @@ -1,31 +0,0 @@ > -/** @file >=20 > - Source code file for a temporary build workaround. >=20 > - >=20 > - The purpose of this workaround is described in the module INF file. >=20 > - >=20 > -Copyright (c) 2019, Intel Corporation. All rights reserved.
>=20 > -SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > - >=20 > -**/ >=20 > - >=20 > -#include >=20 > -#include >=20 > - >=20 > -/** >=20 > - An empty entry point function. >=20 > - >=20 > - @param FileHandle Handle of the file being invoked. >=20 > - @param PeiServices Describes the list of possible PEI Services. >=20 > - >=20 > - @retval EFI_SUCCESS This function always returns EFI_SUCCESS. >=20 > - >=20 > -**/ >=20 > -EFI_STATUS >=20 > -EFIAPI >=20 > -TemporaryBuildWorkaroundEntry ( >=20 > - IN EFI_PEI_FILE_HANDLE FileHandle, >=20 > - IN CONST EFI_PEI_SERVICES **PeiServices >=20 > - ) >=20 > -{ >=20 > - return EFI_SUCCESS; >=20 > -} >=20 > diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/T= emporaryBuildWorkaround.dsc > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBui= ldWorkaround.dsc > deleted file mode 100644 > index c62f9ecc6e..0000000000 > --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporar= yBuildWorkaround.dsc > +++ /dev/null > @@ -1,76 +0,0 @@ > -## @file >=20 > -# Build description file for a temporary build workaround. >=20 > -# >=20 > -# The feature enable PCD for advanced features must be referenced in an = INF >=20 > -# to be referenced in DSC/FDF files. This DSC only exists in the build t= o >=20 > -# allow the PCDs to be referenced. This workaround does not affect the f= inal >=20 > -# flash image or boot in any way. >=20 > -# >=20 > -# The request to update BaseTools to allow a PCD to be referenced in DSC= /FDF >=20 > -# files without requiring the PCD to be referenced in an INF file is tra= cked >=20 > -# here: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2270 >=20 > -# >=20 > -# When the BaseTools update is complete, this file can entirely be remov= ed >=20 > -# from this package. >=20 > -# >=20 > -# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
>=20 > -# >=20 > -# SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > -# >=20 > -## >=20 > - >=20 > -# >=20 > -# BEGIN:Temporary Build Workaround (resolution: https://bugzilla.tianoco= re.org/show_bug.cgi?id=3D2270) >=20 > -# >=20 > - >=20 > -# THIS FILE IS TEMPORARY. PLEASE TRY TO LOOK PAST THE "HACKS" ASSOCIATED= WITH IT. >=20 > -# >=20 > -# With the BaseTools change requested, the changes needed to move to the= end state are simply: >=20 > -# 1. Remove the !include for this file in AdvancedFeatures.dsc >=20 > -# 2. Remove this directory >=20 > - >=20 > -!if $(PLATFORM_NAME) !=3D AdvancedFeaturePkg >=20 > -# >=20 > -# AdvancedFeaturePkg initializes all FeaturePCDs to TRUE so they can con= veniently be built in one package. >=20 > -# Board packages will normally only enable (and therefore reference) a s= mall subset of advanced features >=20 > -# relative to the board. If an INF does not reference a package DEC file= (which will be the case if the >=20 > -# feature is not enabled) then the DSC must set ("define") the PCD for t= he conditional statements based >=20 > -# on the PCD to work. >=20 > -# >=20 > -# AdvancedFeaturePkg has no problem as it naturally has a need to set al= PCDs to TRUE for build. >=20 > -# The section below sets all PCDs to FALSE in the DSC file so if the fea= ture is not enabled by a board, >=20 > -# the build will still be successful. >=20 > -# >=20 > -[PcdsFeatureFlag] >=20 > - gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable = |FALSE >=20 > - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable = |FALSE >=20 > - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable = |FALSE >=20 > - gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable = |FALSE >=20 > - gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable = |FALSE >=20 > - gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable = |FALSE >=20 > - gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = |FALSE >=20 > - gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable = |FALSE >=20 > - gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE >=20 > -!endif >=20 > - >=20 > -# >=20 > -# The LibraryClasses required to build TemporaryBuildWorkaround.inf >=20 > -# (mostly libraries requiring other libraries) >=20 > -# >=20 > -[LibraryClasses] >=20 > - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf >=20 > - BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.i= nf >=20 > - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf >=20 > - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf >=20 > - PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf >=20 > - PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf >=20 > - PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibId= t/PeiServicesTablePointerLibIdt.inf >=20 > - >=20 > -# >=20 > -# The driver that references all feature PCDs to satsify current build l= imitations >=20 > -# >=20 > -[Components] >=20 > - AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.i= nf >=20 > -# >=20 > -# END:Temporary Build Workaround (resolution: https://bugzilla.tianocore= .org/show_bug.cgi?id=3D2270) >=20 > -# >=20 > diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/T= emporaryBuildWorkaround.inf > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBui= ldWorkaround.inf > deleted file mode 100644 > index 00818fbe0a..0000000000 > --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporar= yBuildWorkaround.inf > +++ /dev/null > @@ -1,60 +0,0 @@ > -### @file >=20 > -# Component information file for a temporary build workaround. >=20 > -# >=20 > -# The feature enable PCD for this package must be referenced in an INF t= o be >=20 > -# referenced in DSC/FDF files. This driver is only included in the build= to >=20 > -# allow the PCD to be referenced. This driver is not included in the fla= sh >=20 > -# image and does not affect the boot in any way. >=20 > -# >=20 > -# The request to update BaseTools to allow a PCD to be referenced in DSC= /FDF >=20 > -# files without requiring the PCD to be referenced in an INF file is tra= cked >=20 > -# here: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2270 >=20 > -# >=20 > -# When the BaseTools update is complete, this file can entirely be remov= ed >=20 > -# from this package. >=20 > -# >=20 > -# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
>=20 > -# >=20 > -# SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > -# >=20 > -### >=20 > - >=20 > -[Defines] >=20 > - INF_VERSION =3D 0x00010017 >=20 > - BASE_NAME =3D TemporaryBuildWorkaround >=20 > - FILE_GUID =3D 8846A81E-F552-4917-81F5-80B62E4EFBAC >=20 > - VERSION_STRING =3D 1.0 >=20 > - MODULE_TYPE =3D PEIM >=20 > - ENTRY_POINT =3D TemporaryBuildWorkaroundEntry >=20 > - >=20 > -[LibraryClasses] >=20 > - BaseLib >=20 > - PeimEntryPoint >=20 > - >=20 > -[Packages] >=20 > - MdePkg/MdePkg.dec >=20 > - Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec >=20 > - Debugging/Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dec >=20 > - Network/NetworkFeaturePkg/NetworkFeaturePkg.dec >=20 > - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec >=20 > - PowerManagement/S3FeaturePkg/S3FeaturePkg.dec >=20 > - SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec >=20 > - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec >=20 > - UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec >=20 > - >=20 > -[FeaturePcd] >=20 > - gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable >=20 > - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable >=20 > - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable >=20 > - gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable >=20 > - gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable >=20 > - gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable >=20 > - gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable >=20 > - gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable >=20 > - gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable >=20 > - >=20 > -[Sources] >=20 > - TemporaryBuildWorkaround.c >=20 > - >=20 > -[Depex] >=20 > - TRUE >=20 > -- > 2.24.0.windows.2