Hi Eric, OK, I will combine them into one patch. Thanks, Heng
> -----Original Message----- > From: Dong, Eric <eric.d...@intel.com> > Sent: Friday, April 24, 2020 8:52 AM > To: Luo, Heng <heng....@intel.com>; devel@edk2.groups.io > Cc: Michael Kubacki <michael.a.kuba...@intel.com>; Gao, Liming > <liming....@intel.com>; Ni, Ray <ray...@intel.com> > Subject: RE: [PATCH 2/2] Platform/Intel: Cleanup temporary build > workaround related code > > Hi Heng, > > You can't separate these two patches like this. Because in this case, the > first > patch will cause all platforms which use > AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaro > und.dsc file build error. > Please reorg the patches to make all patches can pass build for all platforms. > > Thanks, > Eric > > -----Original Message----- > > From: Luo, Heng > > Sent: Thursday, April 23, 2020 4:43 PM > > To: devel@edk2.groups.io > > Cc: Michael Kubacki <michael.a.kuba...@intel.com>; Gao, Liming > > <liming....@intel.com>; Dong, Eric <eric.d...@intel.com>; Ni, Ray > > <ray...@intel.com> > > Subject: [PATCH 2/2] Platform/Intel: Cleanup temporary build > > workaround related code > > > > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2688 > > > > Use AdvancedFeaturePkg/Include/AdvancedFeaturesPcd.dsc instead of > > > AdvancedFeaturePkg/TemporaryBuildWorkaround/TemporaryBuildWorkaro > > und.dsc > > > > Cc: Michael Kubacki <michael.a.kuba...@intel.com> > > Cc: Liming Gao <liming....@intel.com> > > Cc: Eric Dong <eric.d...@intel.com> > > Cc: Ray Ni <ray...@intel.com> > > Signed-off-by: Heng Luo <heng....@intel.com> > > --- > > > > 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 +- > > > > > Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPk > > g.dsc | 2 +- > > 6 files changed, 6 insertions(+), 6 deletions(-) > > > > 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 = FALSE DEFINE > > NETWORK_ALLOW_HTTP_CONNECTIONS = 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 > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#58011): https://edk2.groups.io/g/devel/message/58011 Mute This Topic: https://groups.io/mt/73214616/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-