From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.1397.1587714075665234016 for ; Fri, 24 Apr 2020 00:41:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=FSc/1mt4; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: heng.luo@intel.com) IronPort-SDR: W5KtK+1op1VwfASGMwdr502AABhSw+6glEciFWFzEmgKjMI4Q7IcZffkpH1KEuVaUJtPLJWt0D doeya2P9hJrA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Apr 2020 00:41:14 -0700 IronPort-SDR: wEHRfWWDun/4rSeHi0chO4HdS6Uvn3QE2B2l1X47ev8BqhGhxSF7IEHxaArzRe6rUt7Gc0tHyQ eXO/iXvkUzBg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,310,1583222400"; d="scan'208";a="248000790" Received: from orsmsx102.amr.corp.intel.com ([10.22.225.129]) by fmsmga008.fm.intel.com with ESMTP; 24 Apr 2020 00:41:13 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by ORSMSX102.amr.corp.intel.com (10.22.225.129) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 24 Apr 2020 00:41:12 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.108) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 24 Apr 2020 00:41:12 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TBJ7KE+doOYnMuKFp48/qtswzRoUcKeRrGApwLGEZWs63sJqS/Pf1mGi7+3VkFZrHj3gl00nDx1phm0rTqBi8OMGM8o47bU4HywlWkyASe+Og940E6KwNvBJIBu36ef7mrWb/XbCNhybqMpPJUMjf0zs+xOEAXE0Xv9yhHfp4GyKBgYu7Q3zReAIS598pUp8GaKMTiDpdZ7PKZ6JyCojwI545G8YtcEAxiPz3XSc2tJt9IjJbWM8qnRtUvcO+6VhWJdeldW2CvHDi0djpTYq3IHTDxf7HWnJl9705v0/DypiWLemLuyqYDZuwnOzG6bE3nzYSWHNP7kXajCs9BtJ9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vS4CW8FhTrJUUmBBQYdFBAP1ZLpZ+x2y+K5Bpah6XDE=; b=G75URi6EnjFfvLOr61YrwPvWW8yTKMZCzWnwPzxIWTSQob723GLiXvJhYXkfL/cWqjWMGkOWTI5OuVPH3n1oyRaCgrr35HbBVDzAmjWx/7PK+Q9xTEc8MMGfYB3ftfBh3ByCw1oA+ctDQnc+txUkMHe9byTq5aquhclsRRFw+aSHyX7j1SFCQbq3kqyaLfDXGs2dbbP9jj2/eYSI1THiRQXvqUQqyo/n+1QgLjes69YLOGGXC7dlWImq2cflSSOXATyztdQOcnaGaOA/PJ6dJJgi4uFHgi4kWIrE/vXFeLNT1jA+07njbr/tXbS/TohKDKFFNYSc0OIidkpaKSz2NQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vS4CW8FhTrJUUmBBQYdFBAP1ZLpZ+x2y+K5Bpah6XDE=; b=FSc/1mt4tzPB66JWpYQS5HpscaMv32WXKeQq20TkfJMz+jjTxg4CsqUhNGNibv4xy25Z88kO282qsei1sNceLV31RMjNpeEFpVHzQX8K5h0ceZCQTfvFH9pT77iiG3hMTU8VZcqSrFY8YeRH37NCxk2tUjZLBNpr9+GKWazyuM4= Received: from MWHPR11MB1805.namprd11.prod.outlook.com (2603:10b6:300:114::14) by MWHPR11MB1423.namprd11.prod.outlook.com (2603:10b6:300:22::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.29; Fri, 24 Apr 2020 07:41:11 +0000 Received: from MWHPR11MB1805.namprd11.prod.outlook.com ([fe80::9cd5:39ad:6a4d:34d3]) by MWHPR11MB1805.namprd11.prod.outlook.com ([fe80::9cd5:39ad:6a4d:34d3%12]) with mapi id 15.20.2921.033; Fri, 24 Apr 2020 07:41:11 +0000 From: "Heng Luo" To: "Ni, Ray" , "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/OTGi4bxsT0KXG4JV9EyKDqiGlfdQgADZ8ECAAEipgIAAK85A Date: Fri, 24 Apr 2020 07:41:11 +0000 Message-ID: References: <20200423084258.1100-1-heng.luo@intel.com> <20200423084258.1100-2-heng.luo@intel.com> <734D49CCEBEEF84792F5B80ED585239D5C50A9E0@SHSMSX104.ccr.corp.intel.com> <734D49CCEBEEF84792F5B80ED585239D5C50C320@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5C50C320@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.2.0.6 authentication-results: spf=none (sender IP is ) smtp.mailfrom=heng.luo@intel.com; x-originating-ip: [192.102.204.45] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d06db24c-e164-4812-2b6c-08d7e822dc1b x-ms-traffictypediagnostic: MWHPR11MB1423: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-forefront-prvs: 03838E948C x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1805.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(10019020)(136003)(366004)(376002)(396003)(39860400002)(346002)(66476007)(966005)(66556008)(8676002)(66446008)(19627235002)(66946007)(76116006)(478600001)(52536014)(54906003)(55016002)(64756008)(4326008)(316002)(107886003)(110136005)(7696005)(30864003)(186003)(33656002)(9686003)(71200400001)(5660300002)(2906002)(26005)(86362001)(81156014)(8936002)(6506007)(53546011);DIR:OUT;SFP:1102; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: G5KQB8ZXcZtL3hRR3JoCoqPuRMOIn/ydUZQ1yr7OxWBpd0FhVgxP84OPxflb1vB4CjbvId+RLQDAHlmdT/2x7gbX8ch6T9uLj0/zsPlDV0yW82Q1a4jBjRJdZTRiOmLjRMOq4FW9ZIvpGgWwUnp4zb2qizmdqDL4/kg5rHc7GssaB3kQGUO5xTSFxF4QI2oEzos5oLP8sW1BDX1zz4KKk21jAzRFGbgEWF/aFQdr9z8RE2mDBD1sK+qGIZ+tr4VV5ATX0z2hQlvJ/FYVC4VS8utQJEhNtgbxAHKCM7yjInnEy07ochtUrJPy8NB35lsfuCW7Tiy2gZDrYlvxsN8Y1468BqeAryRUUqqIKkkcYSyp5djQH0reXqx4OLmIw7WFQMgZoeNhuuBkIdRG4wmf8HT0tI1iJKQtufT/8aH91Oq2yH+JQGV5qJmAsvSB1+5pYtS9uTtUA08uJiFwgiqM3xngZUs3936FP1NOmiXylT/IK7uwgJnlqLVRLax62BVI7CH4F18ygHjHi3fJZ3bFEA== x-ms-exchange-antispam-messagedata: 6PPvPH14cnW+27FY8uSx636ZnX2KF+02E07EXVZw3LGXSD9w5YqoAHZU+8ZU7S/WUYNBw0EanQBh/h8iCPow4voe4P+rV03W5dsG+aO4Zj0Nyv3rQFP8n6GehatIgEvgGz2LWYURNXXRoVdUu2LDoA== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: d06db24c-e164-4812-2b6c-08d7e822dc1b X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Apr 2020 07:41:11.3465 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GuienOTrr9mIezDghpfUU16/+CWtzW3dZibVpB9eb3Grtfgzod1O48iTlwPRLPyg3Mq75vAq+DW4hhudc3oFPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1423 Return-Path: heng.luo@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Dear all, I combined 2 patches into one following Eric's suggestion, new patch have b= een sent out, please help to review. Thanks, Heng > -----Original Message----- > From: Ni, Ray > Sent: Friday, April 24, 2020 1:03 PM > 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 >=20 > Thanks for the explanation. Make sense to me. >=20 >=20 > > -----Original Message----- > > From: Luo, Heng > > Sent: Friday, April 24, 2020 9:06 AM > > To: Ni, Ray ; devel@edk2.groups.io > > Cc: Michael Kubacki ; Gao, Liming > > ; Dong, Eric > > Subject: RE: [PATCH 1/2] Features/Intel/AdvancedFeaturePkg: Remove > > temporary build workaround > > > > Hi Ray, > > Option 1, In current implement, the usage of AdvancedFeaturePkg in boar= d > DSC is: > > > > !include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc # invoke > > section "[Packages]", define default Feature PCD > > #option: [PcdsFeatureFlag], board can override default Feature PCD here= , > enable specific feature. > > !include Include/AdvancedFeatures.dsc > > > > Option 2, if there is no AdvancedFeaturesPcd.dsc, we can move section > > "[Packages]" to AdvancedFeatures.dsc, there is 2 concerns here: > > 1. there is no default Feature PCD now, we need to add > > [PcdsFeatureFlag] below in every OpenBoardPkg.dsc. if we add a new > > feature, we have to change all OpenBoardPkg.dsc files, but in option > > 1, we just need to change AdvancedFeaturesPcd.dsc [PcdsFeatureFlag] > > gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable > |FALSE > > gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable > |FALSE > > ..... > > > > 2. we define FeaturePCDs before section "[Packages]", it does work, but= it > looks strange. > > > > So I would like option 1, but I also agree option2 if you think it is b= etter. > > > > Thanks, > > Heng > > > -----Original Message----- > > > From: Ni, Ray > > > Sent: Thursday, April 23, 2020 7:43 PM > > > 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 > > > > > > 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 > > > > > > > > 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/Temporar > > > yBuildWorkaround.c | 31 --------------------------- > > > > ---- > > > > > > > > > > > > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporar > > > yBu > > > > ildWorkaround.dsc | 76 -------------------------- > > > > -------------------------------------------------- > > > > > > > > > > > > Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Temporar > > > yBu > > > > ildWorkaround.inf | 60 --------------------------- > > > > --------------------------------- > > > > 5 files changed, 42 insertions(+), 168 deletions(-) > > > > > > > > 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 > > > > > > > > DXE_ARCH =3D X64 > > > > > > > > > > > > > > > > -!include > > > > > > > > AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaro > > > und.d > > > > sc > > > > > > > > +!include AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc > > > > > > > > > > > > > > > > > > > > > > > > ################################################################ > > > ###### > > > > ########## > > > > > > > > # > > > > > > > > diff --git > > > > > a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.ds > > > > c > > > > > b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.ds > > > > c > > > > new file mode 100644 > > > > index 0000000000..2eacec18a0 > > > > --- /dev/null > > > > +++ > > > b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.ds > > > > +++ c > > > > @@ -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 features > > > > > > > > +# can be conditionally built by enabling the respective feature > > > > +via its > > > FeaturePCD. > > > > > > > > +# > > > > > > > > +# 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 advanced 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/Tempor > > > ary > > > > BuildWorkaround.c > > > > > > > > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > > > ary > > > > BuildWorkaround.c > > > > deleted file mode 100644 > > > > index 2cd91b06f0..0000000000 > > > > --- > > > > > > > > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > > > ary > > > > BuildWorkaround.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 fi= le. > > > > > > > > - > > > > > > > > -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/Tempor > > > ary > > > > BuildWorkaround.dsc > > > > > > > > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > > > ary > > > > BuildWorkaround.dsc > > > > deleted file mode 100644 > > > > index c62f9ecc6e..0000000000 > > > > --- > > > > > > > > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > > > ary > > > > BuildWorkaround.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 final > > > > > > > > -# flash image or boot in any way. > > > > > > > > -# > > > > > > > > -# The request to update BaseTools to allow a PCD to be referenced > > > > in DSC/FDF > > > > > > > > -# files without requiring the PCD to be referenced in an INF file > > > > is tracked > > > > > > > > -# 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 WITH IT. > > > > > > > > -# > > > > > > > > -# With the BaseTools change requested, the changes needed to move > > > > to > > > the end 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 > > > conveniently be built in one package. > > > > > > > > -# Board packages will normally only enable (and therefore > > > > reference) a small 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 > > > PCDs to TRUE for build. > > > > > > > > -# The section below sets all PCDs to FALSE in the DSC file so if > > > > the feature 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/BaseMemoryLibRe > > > pStr.i > > > > nf > > > > > > > > - 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/PeiServicesTablePointerL > > > > PeiServicesTablePointerLib|ibId > > > > t/PeiServicesTablePointerLibIdt.inf > > > > > > > > - > > > > > > > > -# > > > > > > > > -# The driver that references all feature PCDs to satsify current > > > > build limitations > > > > > > > > -# > > > > > > > > -[Components] > > > > > > > > - > > > > > > > > AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaro > > > und.i > > > > nf > > > > > > > > -# > > > > > > > > -# END:Temporary Build Workaround (resolution: > > > > https://bugzilla.tianocore.org/show_bug.cgi?id=3D2270) > > > > > > > > -# > > > > > > > > diff --git > > > > > > > > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > > > ary > > > > BuildWorkaround.inf > > > > > > > > b/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > > > ary > > > > BuildWorkaround.inf > > > > deleted file mode 100644 > > > > index 00818fbe0a..0000000000 > > > > --- > > > > > > > > a/Features/Intel/AdvancedFeaturePkg/TemporaryBuildWorkaround/Tempor > > > ary > > > > BuildWorkaround.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/FDF > > > > > > > > -# files without requiring the PCD to be referenced in an INF file > > > > is tracked > > > > > > > > -# 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 > > > > > > > > -- > > > > 2.24.0.windows.2 > > >=20