Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: David David <david.wei@intel.com>
---
Vlv2TbltDevicePkg/PlatformPkg.fdf | 9 +++++++--
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 9 +++++++--
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 18 +++++++++++-------
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 18 +++++++++++-------
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 18 +++++++++++-------
5 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Vlv2TbltDevicePkg/PlatformPkg.fdf
index cb5b6b7cc3..5ed85f4dee 100644
--- a/Vlv2TbltDevicePkg/PlatformPkg.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf
@@ -1,7 +1,7 @@
#/** @file
# FDF file of Platform.
#
-# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution.
@@ -716,7 +716,12 @@ [FV.FVMAIN]
SECTION PE32 = ShellBinPkg/UefiShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi
}
-
+#
+# dp command
+#
+!if $(PERFORMANCE_ENABLE) == TRUE
+INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
+!endif
!if $(GOP_DRIVER_ENABLE) == TRUE
FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
index 4243b0797b..a02a4f6286 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
+++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf
@@ -1,7 +1,7 @@
#/** @file
# FDF file of Platform.
#
-# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution.
@@ -673,7 +673,12 @@ [FV.FVMAIN]
SECTION PE32 = EdkShellBinPkg/MinimumShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi
}
-
+#
+# dp command
+#
+!if $(PERFORMANCE_ENABLE) == TRUE
+INF ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf
+!endif
!if $(GOP_DRIVER_ENABLE) == TRUE
FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA {
diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index d773cbd726..f98263d8a5 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -1,7 +1,7 @@
#/** @file
# Platform description.
#
-# Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution.
@@ -1279,13 +1279,17 @@ [Components.X64]
IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf
- PerformancePkg/Dp_App/Dp.inf {
- <LibraryClasses>
- !if $(PERFORMANCE_ENABLE) == TRUE
- PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
- TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
- !endif
+ #
+ # Performance Application; Set PERFORMANCE_ENABLE=TRUE for normal boot performance and smm performance data
+ #
+!if $(PERFORMANCE_ENABLE) == TRUE
+ ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {
+ <PcdsFixedAtBuild>
+ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+ <LibraryClasses>
+ PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf
}
+!endif
Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{
<LibraryClasses>
diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index ac52340079..c755df2fe2 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -1,7 +1,7 @@
#/** @file
# Platform description.
#
-# Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution.
@@ -1267,13 +1267,17 @@ [Components.IA32]
IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf
- PerformancePkg/Dp_App/Dp.inf {
- <LibraryClasses>
- !if $(PERFORMANCE_ENABLE) == TRUE
- PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
- TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
- !endif
+ #
+ # Performance Application; Set PERFORMANCE_ENABLE=TRUE for normal boot performance and smm performance data
+ #
+!if $(PERFORMANCE_ENABLE) == TRUE
+ ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {
+ <PcdsFixedAtBuild>
+ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+ <LibraryClasses>
+ PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf
}
+!endif
Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{
<LibraryClasses>
diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 0f0eaaba6c..dda8216e6a 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -1,7 +1,7 @@
#/** @file
# Platform description.
#
-# Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials are licensed and made available under
# the terms and conditions of the BSD License that accompanies this distribution.
@@ -1279,13 +1279,17 @@ [Components.X64]
IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.inf
- PerformancePkg/Dp_App/Dp.inf {
- <LibraryClasses>
- !if $(PERFORMANCE_ENABLE) == TRUE
- PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
- TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAcpiTimerLib.inf
- !endif
+ #
+ # Performance Application; Set PERFORMANCE_ENABLE=TRUE for normal boot performance and smm performance data
+ #
+!if $(PERFORMANCE_ENABLE) == TRUE
+ ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {
+ <PcdsFixedAtBuild>
+ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
+ <LibraryClasses>
+ PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf
}
+!endif
Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{
<LibraryClasses>
--
2.15.0.gvfs.1.preview.4
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Reviewed-by: zwei4 <david.wei@intel.com> Thanks, David Wei Intel SSG/STO/UEFI BIOS > -----Original Message----- > From: Ni, Ruiyu > Sent: Wednesday, November 29, 2017 4:15 PM > To: edk2-devel@lists.01.org > Cc: Wei, David <david.wei@intel.com> > Subject: [PATCH 1/2] Vlv2TbltDevicePkg: Use DpDynamicCommand to > replace PerformancePkg/dp > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com> > Cc: David David <david.wei@intel.com> > --- > Vlv2TbltDevicePkg/PlatformPkg.fdf | 9 +++++++-- > Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 9 +++++++-- > Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 18 +++++++++++------- > Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 18 +++++++++++------- > Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 18 +++++++++++------- > 5 files changed, 47 insertions(+), 25 deletions(-) > > diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf > b/Vlv2TbltDevicePkg/PlatformPkg.fdf > index cb5b6b7cc3..5ed85f4dee 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf > +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf > @@ -1,7 +1,7 @@ > #/** @file > # FDF file of Platform. > # > -# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.<BR> > # > # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this > distribution. > @@ -716,7 +716,12 @@ [FV.FVMAIN] > SECTION PE32 = > ShellBinPkg/UefiShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi > } > > - > +# > +# dp command > +# > +!if $(PERFORMANCE_ENABLE) == TRUE > +INF > ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf > +!endif > > !if $(GOP_DRIVER_ENABLE) == TRUE > FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA { > diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > index 4243b0797b..a02a4f6286 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > @@ -1,7 +1,7 @@ > #/** @file > # FDF file of Platform. > # > -# Copyright (c) 2008 - 2016, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.<BR> > # > # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this > distribution. > @@ -673,7 +673,12 @@ [FV.FVMAIN] > SECTION PE32 = > EdkShellBinPkg/MinimumShell/$(EDK_DXE_ARCHITECTURE)/Shell.efi > } > > - > +# > +# dp command > +# > +!if $(PERFORMANCE_ENABLE) == TRUE > +INF > ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf > +!endif > > !if $(GOP_DRIVER_ENABLE) == TRUE > FILE FREEFORM = 878AC2CC-5343-46F2-B563-51F89DAF56BA { > diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > index d773cbd726..f98263d8a5 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > @@ -1,7 +1,7 @@ > #/** @file > # Platform description. > # > -# Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR> > # > # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this > distribution. > @@ -1279,13 +1279,17 @@ [Components.X64] > > > IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.i > nf > > - PerformancePkg/Dp_App/Dp.inf { > - <LibraryClasses> > - !if $(PERFORMANCE_ENABLE) == TRUE > - > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma > nceLib.inf > - > TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc > piTimerLib.inf > - !endif > + # > + # Performance Application; Set PERFORMANCE_ENABLE=TRUE for normal > boot performance and smm performance data > + # > +!if $(PERFORMANCE_ENABLE) == TRUE > + > ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf > { > + <PcdsFixedAtBuild> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + <LibraryClasses> > + > PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmm > PerformanceLib.inf > } > +!endif > > Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{ > <LibraryClasses> > diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > index ac52340079..c755df2fe2 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > @@ -1,7 +1,7 @@ > #/** @file > # Platform description. > # > -# Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR> > # > # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this > distribution. > @@ -1267,13 +1267,17 @@ [Components.IA32] > > > IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.i > nf > > - PerformancePkg/Dp_App/Dp.inf { > - <LibraryClasses> > - !if $(PERFORMANCE_ENABLE) == TRUE > - > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma > nceLib.inf > - > TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc > piTimerLib.inf > - !endif > + # > + # Performance Application; Set PERFORMANCE_ENABLE=TRUE for normal > boot performance and smm performance data > + # > +!if $(PERFORMANCE_ENABLE) == TRUE > + > ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf > { > + <PcdsFixedAtBuild> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + <LibraryClasses> > + > PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmm > PerformanceLib.inf > } > +!endif > > Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{ > <LibraryClasses> > diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > index 0f0eaaba6c..dda8216e6a 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > @@ -1,7 +1,7 @@ > #/** @file > # Platform description. > # > -# Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2012 - 2017, Intel Corporation. All rights reserved.<BR> > # > # This program and the accompanying materials are licensed and made > available under > # the terms and conditions of the BSD License that accompanies this > distribution. > @@ -1279,13 +1279,17 @@ [Components.X64] > > > IntelFrameworkModulePkg/Universal/LegacyRegionDxe/LegacyRegionDxe.i > nf > > - PerformancePkg/Dp_App/Dp.inf { > - <LibraryClasses> > - !if $(PERFORMANCE_ENABLE) == TRUE > - > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforma > nceLib.inf > - > TimerLib|$(PLATFORM_PACKAGE)/Library/IntelPchAcpiTimerLib/IntelPchAc > piTimerLib.inf > - !endif > + # > + # Performance Application; Set PERFORMANCE_ENABLE=TRUE for normal > boot performance and smm performance data > + # > +!if $(PERFORMANCE_ENABLE) == TRUE > + > ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf > { > + <PcdsFixedAtBuild> > + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE > + <LibraryClasses> > + > PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmm > PerformanceLib.inf > } > +!endif > > Vlv2TbltDevicePkg/VlvPlatformInitDxe/VlvPlatformInitDxe.inf{ > <LibraryClasses> > -- > 2.15.0.gvfs.1.preview.4 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
© 2016 - 2024 Red Hat, Inc.