From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web10.3801.1587689524136659056 for ; Thu, 23 Apr 2020 17:52:04 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: eric.dong@intel.com) IronPort-SDR: uMnYJpigFdgFOYsdf1tg4snoRC/UVNZcbjHmOICkD+D1XOjB8RECF5IYfwm5NYBxRNEL1LF8hS cG7ikCGw7Ziw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2020 17:52:03 -0700 IronPort-SDR: LYaXb5pUzUltBjJeCEjeQzOncop6DZOAqBHziEsWa3sOnFflBAGK41Y5wzck68FALVZbP1B6gH 7SjkOyZZSwBg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,309,1583222400"; d="scan'208";a="291388872" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga002.fm.intel.com with ESMTP; 23 Apr 2020 17:52:03 -0700 Received: from fmsmsx162.amr.corp.intel.com (10.18.125.71) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 23 Apr 2020 17:51:51 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by fmsmsx162.amr.corp.intel.com (10.18.125.71) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 23 Apr 2020 17:51:51 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.138]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.89]) with mapi id 14.03.0439.000; Fri, 24 Apr 2020 08:51:48 +0800 From: "Dong, Eric" To: "Luo, Heng" , "devel@edk2.groups.io" CC: Michael Kubacki , "Gao, Liming" , "Ni, Ray" Subject: Re: [PATCH 2/2] Platform/Intel: Cleanup temporary build workaround related code Thread-Topic: [PATCH 2/2] Platform/Intel: Cleanup temporary build workaround related code Thread-Index: AQHWGUtBuKDcPH7tXUCD4xAPFC2TSqiHcWSw Date: Fri, 24 Apr 2020 00:51:47 +0000 Message-ID: References: <20200423084258.1100-1-heng.luo@intel.com> <20200423084258.1100-3-heng.luo@intel.com> In-Reply-To: <20200423084258.1100-3-heng.luo@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: eric.dong@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Heng, You can't separate these two patches like this. Because in this case, the f= irst patch will cause all platforms which use AdvancedFeaturePkg/TemporaryB= uildWorkaround/TemporaryBuildWorkaround.dsc file build error. Please reorg the patches to make all patches can pass build for all platfor= ms. Thanks, Eric > -----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 2/2] Platform/Intel: Cleanup temporary build workaround > related code >=20 > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2688 >=20 > Use AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc instead of > AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaro > und.dsc >=20 > Cc: Michael Kubacki > Cc: Liming Gao > Cc: Eric Dong > Cc: Ray Ni > Signed-off-by: Heng Luo > --- >=20 > Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg.d > sc | 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 +- >=20 > Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk > g.dsc | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) >=20 > diff --git > a/Platform/Intel/CometlakeOpenBoardPkg/CometlakeURvp/OpenBoardPkg > .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 > .ds > +++ c > @@ -39,7 +39,7 @@ > # # Include PCD configuration for this board. #- !include > AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaro > und.dsc+ !include > AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include > OpenBoardPkgPcd.dsc !include > AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git > a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc > 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/TemporaryBuildWorkaro > und.dsc+ !include > AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include > OpenBoardPkgPcd.dsc !include > AdvancedFeaturePkg/Include/AdvancedFeatures.dsc 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/TemporaryBuildWorkaro > und.dsc+ !include > AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include > OpenBoardPkgPcd.dsc !include > AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git > a/Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc > 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 - !include > AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaro > und.dsc+ !include > AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include > $(PROJECT)/OpenBoardPkgPcd.dsc !include > AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/UpXtreme/OpenBoardPkg.dsc > 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/TemporaryBuildWorkaro > und.dsc+ !include > AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include > OpenBoardPkgPcd.dsc !include > AdvancedFeaturePkg/Include/AdvancedFeatures.dsc diff --git > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoard > Pkg.dsc > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoard > Pkg.dsc > index 1a9e608bd6..1dace5ee22 100644 > --- > a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoard > Pkg.dsc > +++ > b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoard > Pk > +++ g.dsc > @@ -39,7 +39,7 @@ > # # Include PCD configuration for this board. #- !include > AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaro > und.dsc+ !include > AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc !include > OpenBoardPkgPcd.dsc !include > AdvancedFeaturePkg/Include/AdvancedFeatures.dsc -- > 2.24.0.windows.2