From nobody Sun May 19 12:26:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58026+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58026+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1587713485; cv=none; d=zohomail.com; s=zohoarc; b=Y40EcyQdppM0MbYSBfMeziDhiFu9p5GAWYSWA5UVp3YM0SZPKIRt5K/cLvXp/TwX4V3AmV+APda+eRIA08BPeXDY9Q+kMQc+LVYu+vMGI9JoVK1O6ZZ3llFcOJaqSrcutRgMKCZKwtB9XdPIIvH+RguIsaqdHLaKePDXzltWs7c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587713485; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=Q86GEyLGHlcqVIHOeyA3BrFkoKJl/QLvqIQH9VyVYxE=; b=mSovKU7VlQTVuY+xjfzZ+uKjL9adQAH5jiF1oA2p7FoRazfleuSkM8+1rD3NiiQQIV3h+m7EBxrClGlM8Td60NX8GBc3NwZnKv/xnKVpP8Dmv0WkmHO7Hy2dLBdYZFcwQH5rdLZiUjXjQS92zxxtPwNrvWH0NXoU5Elora7a65A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58026+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 158771348512630.89709276677388; Fri, 24 Apr 2020 00:31:25 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id X5VCYY1788612xVxyzgOANfx; Fri, 24 Apr 2020 00:31:24 -0700 X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.1322.1587713483152016351 for ; Fri, 24 Apr 2020 00:31:23 -0700 IronPort-SDR: 1WubuNKWs8MiIyvw7KuAXmf8m8vfs+fxzXeCDKlY+QWbwKcu+j/gSC2TjpMfTZ9KArP1Ykf5yk zX+JFLPvmtXA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2020 00:31:20 -0700 IronPort-SDR: IvO6YzHTEwe+Zsr3wRkc7+4DPJuCrstRSRdM4bs35b+tXMjHeenkQQOPQ6D5SLfKFiIKy0fMJk 5FHRrYDn6ZlA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,310,1583222400"; d="scan'208";a="259731017" X-Received: from unknown (HELO hengluo-dev.ccr.corp.intel.com) ([10.239.153.154]) by orsmga006.jf.intel.com with ESMTP; 24 Apr 2020 00:31:17 -0700 From: "Heng Luo" To: devel@edk2.groups.io Cc: Liming Gao , Eric Dong , Ray Ni Subject: [edk2-devel] [PATCH] Remove temporary build workaround in Features/Intel/AdvancedFeaturePkg Date: Fri, 24 Apr 2020 15:31:10 +0800 Message-Id: <20200424073110.1309-1-heng.luo@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,heng.luo@intel.com X-Gm-Message-State: xYglzPfHkM9PfIx84B59knZZx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1587713484; bh=DtuO3DcqZ/+JUp05ujWmRvF1Vmm1tH88Q4cj0v6CAFo=; h=Cc:Date:From:Reply-To:Subject:To; b=DLHJMswQeB6P6iMkF1mu2nQTCraIpXeqspCnLXPxojL632ftuRsI3Jky6MFzBUZu/2H mWtGvBitqHw8z0AnxOjS1pWkajAJsT0g2boK8j2CtcmbUxDCcwPlSldjutL4NP5IbVwZB EKlsSLOI2/Dy5F7deS03Oweg4jqOi3xiTwc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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. Use AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc instead of AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.dsc Cc: Liming Gao Cc: Eric Dong Cc: Ray Ni Signed-off-by: Heng Luo Reviewed-by: Eric Dong --- 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 --------------------------------------------------------= ---- Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc = | 2 +- Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc = | 2 +- Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc = | 2 +- Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc = | 2 +- Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc = | 2 +- Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc = | 2 +- 11 files changed, 48 insertions(+), 174 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 DXE_ARCH =3D X64 =20 -!include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaro= und.dsc +!include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc =20 ##########################################################################= ###### # 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 +# DSC file for defining Pcd of advanced features. +# +# This file is intended to be included into another package so advanced f= eatures +# can be conditionally built by enabling the respective feature via its F= eaturePCD. +# +# Copyright (c) 2020, Intel Corporation. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +# +# The section references the package DEC files, +# it allow a FeaturePCD to be used in a conditional statement +# +[Packages] + MdePkg/MdePkg.dec + AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec + Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dec + NetworkFeaturePkg/NetworkFeaturePkg.dec + IpmiFeaturePkg/IpmiFeaturePkg.dec + S3FeaturePkg/S3FeaturePkg.dec + SmbiosFeaturePkg/SmbiosFeaturePkg.dec + UserAuthFeaturePkg/UserAuthFeaturePkg.dec + LogoFeaturePkg/LogoFeaturePkg.dec + +# +# 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 + gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE 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 - Source code file for a temporary build workaround. - - The purpose of this workaround is described in the module INF file. - -Copyright (c) 2019, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#include -#include - -/** - An empty entry point function. - - @param FileHandle Handle of the file being invoked. - @param PeiServices Describes the list of possible PEI Services. - - @retval EFI_SUCCESS This function always returns EFI_SUCCESS. - -**/ -EFI_STATUS -EFIAPI -TemporaryBuildWorkaroundEntry ( - IN EFI_PEI_FILE_HANDLE FileHandle, - IN CONST EFI_PEI_SERVICES **PeiServices - ) -{ - return EFI_SUCCESS; -} 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 -# Build description file for a temporary build workaround. -# -# The feature enable PCD for advanced features must be referenced in an INF -# to be referenced in DSC/FDF files. This DSC only exists in the build to -# allow the PCDs to be referenced. This workaround does not affect the fin= al -# flash image or boot in any way. -# -# The request to update BaseTools to allow a PCD to be referenced in DSC/F= DF -# files without requiring the PCD to be referenced in an INF file is track= ed -# here: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2270 -# -# When the BaseTools update is complete, this file can entirely be removed -# from this package. -# -# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
-# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -## - -# -# BEGIN:Temporary Build Workaround (resolution: https://bugzilla.tianocore= .org/show_bug.cgi?id=3D2270) -# - -# THIS FILE IS TEMPORARY. PLEASE TRY TO LOOK PAST THE "HACKS" ASSOCIATED W= ITH IT. -# -# With the BaseTools change requested, the changes needed to move to the e= nd state are simply: -# 1. Remove the !include for this file in AdvancedFeatures.dsc -# 2. Remove this directory - -!if $(PLATFORM_NAME) !=3D AdvancedFeaturePkg -# -# AdvancedFeaturePkg initializes all FeaturePCDs to TRUE so they can conve= niently be built in one package. -# Board packages will normally only enable (and therefore reference) a sma= ll subset of advanced features -# relative to the board. If an INF does not reference a package DEC file (= which will be the case if the -# feature is not enabled) then the DSC must set ("define") the PCD for the= conditional statements based -# on the PCD to work. -# -# AdvancedFeaturePkg has no problem as it naturally has a need to set al P= CDs to TRUE for build. -# The section below sets all PCDs to FALSE in the DSC file so if the featu= re is not enabled by a board, -# the build will still be successful. -# -[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 - gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable = |FALSE -!endif - -# -# The LibraryClasses required to build TemporaryBuildWorkaround.inf -# (mostly libraries requiring other libraries) -# -[LibraryClasses] - BaseLib|MdePkg/Library/BaseLib/BaseLib.inf - BaseMemoryLib|MdePkg/Library/BaseMemoryLibRepStr/BaseMemoryLibRepStr.inf - DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf - PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf - PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf - PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf - PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLibIdt/= PeiServicesTablePointerLibIdt.inf - -# -# The driver that references all feature PCDs to satsify current build lim= itations -# -[Components] - AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaround.inf -# -# END:Temporary Build Workaround (resolution: https://bugzilla.tianocore.o= rg/show_bug.cgi?id=3D2270) -# 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 -# Component information file for a temporary build workaround. -# -# The feature enable PCD for this package must be referenced in an INF to = be -# referenced in DSC/FDF files. This driver is only included in the build to -# allow the PCD to be referenced. This driver is not included in the flash -# image and does not affect the boot in any way. -# -# The request to update BaseTools to allow a PCD to be referenced in DSC/F= DF -# files without requiring the PCD to be referenced in an INF file is track= ed -# here: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2270 -# -# When the BaseTools update is complete, this file can entirely be removed -# from this package. -# -# Copyright (c) 2019 - 2020, Intel Corporation. All rights reserved.
-# -# SPDX-License-Identifier: BSD-2-Clause-Patent -# -### - -[Defines] - INF_VERSION =3D 0x00010017 - BASE_NAME =3D TemporaryBuildWorkaround - FILE_GUID =3D 8846A81E-F552-4917-81F5-80B62E4EFBAC - VERSION_STRING =3D 1.0 - MODULE_TYPE =3D PEIM - ENTRY_POINT =3D TemporaryBuildWorkaroundEntry - -[LibraryClasses] - BaseLib - PeimEntryPoint - -[Packages] - MdePkg/MdePkg.dec - Debugging/AcpiDebugFeaturePkg/AcpiDebugFeaturePkg.dec - Debugging/Usb3DebugFeaturePkg/Usb3DebugFeaturePkg.dec - Network/NetworkFeaturePkg/NetworkFeaturePkg.dec - OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec - PowerManagement/S3FeaturePkg/S3FeaturePkg.dec - SystemInformation/SmbiosFeaturePkg/SmbiosFeaturePkg.dec - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec - UserInterface/LogoFeaturePkg/LogoFeaturePkg.dec - -[FeaturePcd] - gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable - gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable - gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable - gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable - gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable - gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable - gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnable - gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable - gLogoFeaturePkgTokenSpaceGuid.PcdJpgEnable - -[Sources] - TemporaryBuildWorkaround.c - -[Depex] - TRUE diff --git a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPk= g.dsc b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc index 14e82ba34d..8e04ca8a4f 100644 --- a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc +++ b/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.dsc @@ -39,7 +39,7 @@ # # Include PCD configuration for this board. # - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorka= round.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc =20 diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.ds= c b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc index bf63d53bef..7bb8cd5279 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc @@ -38,7 +38,7 @@ # # Include PCD configuration for this board. # - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorka= round.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc =20 diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.= dsc b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc index 044688ba4e..ef82f8b716 100644 --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc +++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc @@ -37,7 +37,7 @@ # # Include PCD configuration for this board. # - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorka= round.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc =20 diff --git a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.d= sc b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc index 350a75a313..3bafc1ff0a 100644 --- a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc +++ b/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc @@ -42,7 +42,7 @@ DEFINE NETWORK_ISCSI_ENABLE =3D FALSE DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS =3D TRUE =20 - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorka= round.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include $(PROJECT)/OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc =20 diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.d= sc b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc index 2ab9cb03ea..07cf311210 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc @@ -39,7 +39,7 @@ # # Include PCD configuration for this board. # - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorka= round.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc =20 diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoa= rdPkg.dsc b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoar= dPkg.dsc index 1a9e608bd6..1dace5ee22 100644 --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.d= sc +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.d= sc @@ -39,7 +39,7 @@ # # Include PCD configuration for this board. # - !include AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorka= round.dsc + !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include OpenBoardPkgPcd.dsc !include AdvancedFeaturePkg/Include/AdvancedFeatures.dsc =20 --=20 2.24.0.windows.2 -=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 (#58026): https://edk2.groups.io/g/devel/message/58026 Mute This Topic: https://groups.io/mt/73236633/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-