From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com []) by mx.groups.io with SMTP id smtpd.web10.2711.1587631398343435208 for ; Thu, 23 Apr 2020 01:43:20 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: heng.luo@intel.com) IronPort-SDR: aeaWMoGAdiTbgIkYso73dN6tycI06HWN/hi0D6VkyvIygrYcWt6ZeSVFVxuWH2iiNU+QsR7xWt JrtHILu8P1Zw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2020 01:43:19 -0700 IronPort-SDR: xg3AolSkWa/Efr7tZmX7tz+f1icvOOrzkcD+SAn5VOUXF1V7pwKlOfWIp54k8/pGoAVC6tGIHA bwLaXb99/n3Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,306,1583222400"; d="scan'208";a="402850749" Received: from unknown (HELO hengluo-dev.ccr.corp.intel.com) ([10.239.153.154]) by orsmga004.jf.intel.com with ESMTP; 23 Apr 2020 01:43:18 -0700 From: "Heng Luo" To: devel@edk2.groups.io Cc: Michael Kubacki , Liming Gao , Eric Dong , Ray Ni Subject: [PATCH 1/2] Features/Intel/AdvancedFeaturePkg: Remove temporary build workaround Date: Thu, 23 Apr 2020 16:42:57 +0800 Message-Id: <20200423084258.1100-2-heng.luo@intel.com> X-Mailer: git-send-email 2.24.0.windows.2 In-Reply-To: <20200423084258.1100-1-heng.luo@intel.com> References: <20200423084258.1100-1-heng.luo@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2688 Remove Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround, Add Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc to support Feature PCDs. 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/TemporaryBuildW= orkaround.c | 31 ------------------------------- Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildW= orkaround.dsc | 76 --------------------------------------------------------= -------------------- Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildW= orkaround.inf | 60 --------------------------------------------------------= ---- 5 files changed, 42 insertions(+), 168 deletions(-) diff --git a/Features/Intel/AdvancedFeaturePkg/AdvancedFeaturePkg.dsc b/Fea= tures/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=0D DXE_ARCH =3D X64=0D =0D -!include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaro= und.dsc=0D +!include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc=0D =0D ##########################################################################= ######=0D #=0D diff --git a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.= 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=0D +# DSC file for defining Pcd of advanced features.=0D +#=0D +# This file is intended to be included into another package so advanced f= eatures=0D +# can be conditionally built by enabling the respective feature via its F= eaturePCD.=0D +#=0D +# Copyright (c) 2020, Intel Corporation. All rights reserved.
=0D +#=0D +# SPDX-License-Identifier: BSD-2-Clause-Patent=0D +#=0D +##=0D +=0D +#=0D +# The section references the package DEC files,=0D +# it allow a FeaturePCD to be used in a conditional statement=0D +#=0D +[Packages]=0D + MdePkg/MdePkg.dec=0D + AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec=0D + Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dec=0D + NetworkFeaturePkg/NetworkFeaturePkg.dec=0D + IpmiFeaturePkg/IpmiFeaturePkg.dec=0D + S3FeaturePkg/S3FeaturePkg.dec=0D + SmbiosFeaturePkg/SmbiosFeaturePkg.dec=0D + UserAuthFeaturePkg/UserAuthFeaturePkg.dec=0D + LogoFeaturePkg/LogoFeaturePkg.dec=0D +=0D +#=0D +# The section below sets all PCDs to FALSE in this DSC file so the feature= is not enabled by default.=0D +# Board can set PCDs to TRUE in its DSC file to enable a subset of advance= d features=0D +#=0D +[PcdsFeatureFlag]=0D + gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable = |FALSE=0D + gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable = |FALSE=0D + gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable = |FALSE=0D + gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable = |FALSE=0D + gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable = |FALSE=0D + gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable = |FALSE=0D + gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = |FALSE=0D + gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable = |FALSE=0D + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE=0D diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tem= poraryBuildWorkaround.c b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildW= orkaround/TemporaryBuildWorkaround.c deleted file mode 100644 index 2cd91b06f0..0000000000 --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryB= uildWorkaround.c +++ /dev/null @@ -1,31 +0,0 @@ -/** @file=0D - Source code file for a temporary build workaround.=0D -=0D - The purpose of this workaround is described in the module INF file.=0D -=0D -Copyright (c) 2019, Intel Corporation. All rights reserved.
=0D -SPDX-License-Identifier: BSD-2-Clause-Patent=0D -=0D -**/=0D -=0D -#include =0D -#include =0D -=0D -/**=0D - An empty entry point function.=0D -=0D - @param FileHandle Handle of the file being invoked.=0D - @param PeiServices Describes the list of possible PEI Services.=0D -=0D - @retval EFI_SUCCESS This function always returns EFI_SUCCESS.=0D -=0D -**/=0D -EFI_STATUS=0D -EFIAPI=0D -TemporaryBuildWorkaroundEntry (=0D - IN EFI_PEI_FILE_HANDLE FileHandle,=0D - IN CONST EFI_PEI_SERVICES **PeiServices=0D - )=0D -{=0D - return EFI_SUCCESS;=0D -}=0D diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tem= poraryBuildWorkaround.dsc b/Features/Intel/AdvancedFeaturePkg/TemporaryBuil= dWorkaround/TemporaryBuildWorkaround.dsc deleted file mode 100644 index c62f9ecc6e..0000000000 --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryB= uildWorkaround.dsc +++ /dev/null @@ -1,76 +0,0 @@ -## @file=0D -# Build description file for a temporary build workaround.=0D -#=0D -# The feature enable PCD for advanced features must be referenced in an IN= F=0D -# to be referenced in DSC/FDF files. This DSC only exists in the build to= =0D -# allow the PCDs to be referenced. This workaround does not affect the fin= al=0D -# flash image or boot in any way.=0D -#=0D -# The request to update BaseTools to allow a PCD to be referenced in DSC/F= DF=0D -# files without requiring the PCD to be referenced in an INF file is track= ed=0D -# here: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2270=0D -#=0D -# When the BaseTools update is complete, this file can entirely be removed= =0D -# from this package.=0D -#=0D -# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
=0D -#=0D -# SPDX-License-Identifier: BSD-2-Clause-Patent=0D -#=0D -##=0D -=0D -#=0D -# BEGIN:Temporary Build Workaround (resolution: https://bugzilla.tianocore= .org/show_bug.cgi?id=3D2270)=0D -#=0D -=0D -# THIS FILE IS TEMPORARY. PLEASE TRY TO LOOK PAST THE "HACKS" ASSOCIATED W= ITH IT.=0D -#=0D -# With the BaseTools change requested, the changes needed to move to the e= nd state are simply:=0D -# 1. Remove the !include for this file in AdvancedFeatures.dsc=0D -# 2. Remove this directory=0D -=0D -!if $(PLATFORM_NAME) !=3D AdvancedFeaturePkg=0D -#=0D -# AdvancedFeaturePkg initializes all FeaturePCDs to TRUE so they can conve= niently be built in one package.=0D -# Board packages will normally only enable (and therefore reference) a sma= ll subset of advanced features=0D -# relative to the board. If an INF does not reference a package DEC file (= which will be the case if the=0D -# feature is not enabled) then the DSC must set ("define") the PCD for the= conditional statements based=0D -# on the PCD to work.=0D -#=0D -# AdvancedFeaturePkg has no problem as it naturally has a need to set al P= CDs to TRUE for build.=0D -# The section below sets all PCDs to FALSE in the DSC file so if the featu= re is not enabled by a board,=0D -# the build will still be successful.=0D -#=0D -[PcdsFeatureFlag]=0D - gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable = |FALSE=0D - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable = |FALSE=0D - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable = |FALSE=0D - gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable = |FALSE=0D - gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable = |FALSE=0D - gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable = |FALSE=0D - gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable = |FALSE=0D - gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable = |FALSE=0D - gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE=0D -!endif=0D -=0D -#=0D -# The LibraryClasses required to build TemporaryBuildWorkaround.inf=0D -# (mostly libraries requiring other libraries)=0D -#=0D -[LibraryClasses]=0D - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf=0D - BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf= =0D - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf=0D - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf=0D - PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf=0D - PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf=0D - PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf=0D -=0D -#=0D -# The driver that references all feature PCDs to satsify current build lim= itations=0D -#=0D -[Components]=0D - AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf= =0D -#=0D -# END:Temporary Build Workaround (resolution: https://bugzilla.tianocore.o= rg/show_bug.cgi?id=3D2270)=0D -#=0D diff --git a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tem= poraryBuildWorkaround.inf b/Features/Intel/AdvancedFeaturePkg/TemporaryBuil= dWorkaround/TemporaryBuildWorkaround.inf deleted file mode 100644 index 00818fbe0a..0000000000 --- a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryB= uildWorkaround.inf +++ /dev/null @@ -1,60 +0,0 @@ -### @file=0D -# Component information file for a temporary build workaround.=0D -#=0D -# The feature enable PCD for this package must be referenced in an INF to = be=0D -# referenced in DSC/FDF files. This driver is only included in the build t= o=0D -# allow the PCD to be referenced. This driver is not included in the flash= =0D -# image and does not affect the boot in any way.=0D -#=0D -# The request to update BaseTools to allow a PCD to be referenced in DSC/F= DF=0D -# files without requiring the PCD to be referenced in an INF file is track= ed=0D -# here: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2270=0D -#=0D -# When the BaseTools update is complete, this file can entirely be removed= =0D -# from this package.=0D -#=0D -# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
=0D -#=0D -# SPDX-License-Identifier: BSD-2-Clause-Patent=0D -#=0D -###=0D -=0D -[Defines]=0D - INF_VERSION =3D 0x00010017=0D - BASE_NAME =3D TemporaryBuildWorkaround=0D - FILE_GUID =3D 8846A81E-F552-4917-81F5-80B62E4EFBAC=0D - VERSION_STRING =3D 1.0=0D - MODULE_TYPE =3D PEIM=0D - ENTRY_POINT =3D TemporaryBuildWorkaroundEntry=0D -=0D -[LibraryClasses]=0D - BaseLib=0D - PeimEntryPoint=0D -=0D -[Packages]=0D - MdePkg/MdePkg.dec=0D - Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec=0D - Debugging/Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dec=0D - Network/NetworkFeaturePkg/NetworkFeaturePkg.dec=0D - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec=0D - PowerManagement/S3FeaturePkg/S3FeaturePkg.dec=0D - SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec=0D - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec=0D - UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec=0D -=0D -[FeaturePcd]=0D - gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable=0D - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable=0D - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable=0D - gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable=0D - gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable=0D - gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable=0D - gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable=0D - gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable=0D - gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable=0D -=0D -[Sources]=0D - TemporaryBuildWorkaround.c=0D -=0D -[Depex]=0D - TRUE=0D --=20 2.24.0.windows.2