Kelly, I pushed the commit, following your below recommendation. > -----Original Message----- > From: Steele, Kelly > Sent: Saturday, December 2, 2017 1:18 AM > To: Ni, Ruiyu <ruiyu...@intel.com>; edk2-devel@lists.01.org > Cc: Kinney, Michael D <michael.d.kin...@intel.com> > Subject: RE: [PATCH 2/2] QuarkPlatformPkg: Use DpDynamicCommand to > replace PerformancePkg/dp > > Reviewed-by: Steele, Kelly <kelly.ste...@intel.com> > > My only comment is the fix in Quark.fdf, line #575: > # File System Modules > # > -!if $(PERFORMANCE_ENABLE) > -INF > MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf > -!else > +!if not $(PERFORMANCE_ENABLE) > INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf > INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf > INF FatPkg/EnhancedFatDxe/Fat.inf > !endif > > I would suggest going with the following to keep with the style present in the > rest of the file: > # File System Modules > # > !if $(PERFORMANCE_ENABLE) > -INF > MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf > !else > INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf > INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf > INF FatPkg/EnhancedFatDxe/Fat.inf > !endif > > Thanks, > Kelly > > -----Original Message----- > From: Ni, Ruiyu > Sent: November 29, 2017 00:15 > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D <michael.d.kin...@intel.com>; Steele, Kelly > <kelly.ste...@intel.com> > Subject: [PATCH 2/2] QuarkPlatformPkg: Use DpDynamicCommand to replace > PerformancePkg/dp > > Remove FvSimpleFileSystemDxe from Quark.dsc/fdf because it's not needed by > using DpDynamicCommand driver. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni <ruiyu...@intel.com> > Cc: Michael D Kinney <michael.d.kin...@intel.com> > Cc: Kelly Steele <kelly.ste...@intel.com> > --- > QuarkPlatformPkg/Quark.dsc | 15 +++++++-------- > QuarkPlatformPkg/Quark.fdf | 16 +++++++++------- > QuarkPlatformPkg/QuarkMin.dsc | 13 ++++++++----- > QuarkPlatformPkg/QuarkMin.fdf | 12 ++++++++---- > 4 files changed, 32 insertions(+), 24 deletions(-) > > diff --git a/QuarkPlatformPkg/Quark.dsc b/QuarkPlatformPkg/Quark.dsc index > 025653eee5..5624451e12 100644 > --- a/QuarkPlatformPkg/Quark.dsc > +++ b/QuarkPlatformPkg/Quark.dsc > @@ -163,6 +163,9 @@ [LibraryClasses] > > PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLib > Null.inf > !endif > > + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > + > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > @@ -864,9 +867,6 @@ [Components.IA32] > MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf > MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf > FatPkg/EnhancedFatDxe/Fat.inf > -!if $(PERFORMANCE_ENABLE) > - MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf > -!endif > > # > # Capsule update > @@ -887,10 +887,11 @@ [Components.IA32] > # Performance Application > # > !if $(PERFORMANCE_ENABLE) > - PerformancePkg/Dp_App/Dp.inf { > + ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf { > + <PcdsFixedAtBuild> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > <LibraryClasses> > - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > - FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > + > + > PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerf > orm > + anceLib.inf > } > !endif > > @@ -910,8 +911,6 @@ [Components.IA32] > > NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Comman > dsLib.inf > > NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Co > mmandsLib.inf > > HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.i > nf > - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > - FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > > BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCo > mmandLib.inf > > diff --git a/QuarkPlatformPkg/Quark.fdf b/QuarkPlatformPkg/Quark.fdf index > 19533b2281..5abe3b6f31 100644 > --- a/QuarkPlatformPkg/Quark.fdf > +++ b/QuarkPlatformPkg/Quark.fdf > @@ -2,7 +2,7 @@ > # FDF file of Clanton Peak CRB platform with 32-bit DXE # # This package > provides QuarkNcSocId platform specific modules. > -# Copyright (c) 2013 - 2016 Intel Corporation. > +# Copyright (c) 2013 - 2017 Intel Corporation. > # > # This program and the accompanying materials # are licensed and made > available under the terms and conditions of the BSD License @@ -574,14 > +574,19 @@ [FV.FVMAIN] # # File System Modules # -!if > $(PERFORMANCE_ENABLE) -INF > MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf > -!else > +!if not $(PERFORMANCE_ENABLE) > INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf > INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf > INF FatPkg/EnhancedFatDxe/Fat.inf > !endif > > +# > +# Performance Application > +# > +!if $(PERFORMANCE_ENABLE) > +INF > ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf > +!endif > + > # > # Trusted Platform Module > # > @@ -677,9 +682,6 @@ [FV.PAYLOAD] > # Shell and Applications > # > INF RuleOverride = TIANOCOMPRESSED ShellPkg/Application/Shell/Shell.inf > -!if $(PERFORMANCE_ENABLE) > -INF RuleOverride = TIANOCOMPRESSED PerformancePkg/Dp_App/Dp.inf - > !endif > > !if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE) > > diff --git a/QuarkPlatformPkg/QuarkMin.dsc b/QuarkPlatformPkg/QuarkMin.dsc > index 084f2f4e8f..404f507966 100644 > --- a/QuarkPlatformPkg/QuarkMin.dsc > +++ b/QuarkPlatformPkg/QuarkMin.dsc > @@ -150,6 +150,10 @@ [LibraryClasses] > !else > > PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLib > Null.inf > !endif > + > + ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > + FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > + > !if $(SECURE_BOOT_ENABLE) > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > > PlatformSecureLib|QuarkPlatformPkg/Library/PlatformSecureLib/PlatformSecur > eLib.inf > @@ -614,10 +618,11 @@ [Components.IA32] > # Performance Application > # > !if $(PERFORMANCE_ENABLE) > - PerformancePkg/Dp_App/Dp.inf { > + ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf { > + <PcdsFixedAtBuild> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > <LibraryClasses> > - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > - FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > + > + > PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerf > orm > + anceLib.inf > } > !endif > > @@ -632,8 +637,6 @@ [Components.IA32] > > NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1Comman > dsLib.inf > > NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1Co > mmandsLib.inf > > HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.i > nf > - ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > - FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf > > BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCo > mmandLib.inf > > diff --git a/QuarkPlatformPkg/QuarkMin.fdf b/QuarkPlatformPkg/QuarkMin.fdf > index ac751993d0..b793fbd9a3 100644 > --- a/QuarkPlatformPkg/QuarkMin.fdf > +++ b/QuarkPlatformPkg/QuarkMin.fdf > @@ -2,7 +2,7 @@ > # FDF file of Clanton Peak CRB platform with 32-bit DXE # # This package > provides QuarkNcSocId platform specific modules. > -# Copyright (c) 2013 - 2015 Intel Corporation. > +# Copyright (c) 2013 - 2017 Intel Corporation. > # > # This program and the accompanying materials # are licensed and made > available under the terms and conditions of the BSD License @@ -435,6 +435,13 > @@ [FV.FVMAIN] # INF > MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf > > +# > +# Performance Application > +# > +!if $(PERFORMANCE_ENABLE) > +INF > ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf > +!endif > + > > ################################################################# > ############### > # > # FV Section > @@ -502,9 +509,6 @@ [FV.PAYLOAD] > # Shell and Applications > # > INF ShellPkg/Application/Shell/Shell.inf > -!if $(PERFORMANCE_ENABLE) > -INF PerformancePkg/Dp_App/Dp.inf > -!endif > > > ################################################################# > ############### > # > -- > 2.15.0.gvfs.1.preview.4
_______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel