* [PATCH 0/2] Use DpDynamicCommand to replace PerformancePkg/dp
@ 2017-11-29 8:14 Ruiyu Ni
2017-11-29 8:14 ` [PATCH 1/2] Vlv2TbltDevicePkg: " Ruiyu Ni
2017-11-29 8:14 ` [PATCH 2/2] QuarkPlatformPkg: " Ruiyu Ni
0 siblings, 2 replies; 6+ messages in thread
From: Ruiyu Ni @ 2017-11-29 8:14 UTC (permalink / raw)
To: edk2-devel
Ruiyu Ni (2):
Vlv2TbltDevicePkg: Use DpDynamicCommand to replace PerformancePkg/dp
QuarkPlatformPkg: Use DpDynamicCommand to replace PerformancePkg/dp
QuarkPlatformPkg/Quark.dsc | 15 +++++++--------
QuarkPlatformPkg/Quark.fdf | 16 +++++++++-------
QuarkPlatformPkg/QuarkMin.dsc | 13 ++++++++-----
QuarkPlatformPkg/QuarkMin.fdf | 12 ++++++++----
Vlv2TbltDevicePkg/PlatformPkg.fdf | 9 +++++++--
Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 9 +++++++--
Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 18 +++++++++++-------
Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 18 +++++++++++-------
Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 18 +++++++++++-------
9 files changed, 79 insertions(+), 49 deletions(-)
--
2.15.0.gvfs.1.preview.4
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] Vlv2TbltDevicePkg: Use DpDynamicCommand to replace PerformancePkg/dp
2017-11-29 8:14 [PATCH 0/2] Use DpDynamicCommand to replace PerformancePkg/dp Ruiyu Ni
@ 2017-11-29 8:14 ` Ruiyu Ni
2017-11-29 8:38 ` Wei, David
2017-11-29 8:14 ` [PATCH 2/2] QuarkPlatformPkg: " Ruiyu Ni
1 sibling, 1 reply; 6+ messages in thread
From: Ruiyu Ni @ 2017-11-29 8:14 UTC (permalink / raw)
To: edk2-devel; +Cc: David David
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] QuarkPlatformPkg: Use DpDynamicCommand to replace PerformancePkg/dp
2017-11-29 8:14 [PATCH 0/2] Use DpDynamicCommand to replace PerformancePkg/dp Ruiyu Ni
2017-11-29 8:14 ` [PATCH 1/2] Vlv2TbltDevicePkg: " Ruiyu Ni
@ 2017-11-29 8:14 ` Ruiyu Ni
2017-12-01 17:18 ` Steele, Kelly
1 sibling, 1 reply; 6+ messages in thread
From: Ruiyu Ni @ 2017-11-29 8:14 UTC (permalink / raw)
To: edk2-devel; +Cc: Michael D Kinney, Kelly Steele
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.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Kelly Steele <kelly.steele@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/BasePerformanceLibNull.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/DxeSmmPerformanceLib.inf
}
!endif
@@ -910,8 +911,6 @@ [Components.IA32]
NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
- ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
- FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.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/BasePerformanceLibNull.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/PlatformSecureLib.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/DxeSmmPerformanceLib.inf
}
!endif
@@ -632,8 +637,6 @@ [Components.IA32]
NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
- ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
- FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Vlv2TbltDevicePkg: Use DpDynamicCommand to replace PerformancePkg/dp
2017-11-29 8:14 ` [PATCH 1/2] Vlv2TbltDevicePkg: " Ruiyu Ni
@ 2017-11-29 8:38 ` Wei, David
0 siblings, 0 replies; 6+ messages in thread
From: Wei, David @ 2017-11-29 8:38 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] QuarkPlatformPkg: Use DpDynamicCommand to replace PerformancePkg/dp
2017-11-29 8:14 ` [PATCH 2/2] QuarkPlatformPkg: " Ruiyu Ni
@ 2017-12-01 17:18 ` Steele, Kelly
2017-12-02 8:44 ` Ni, Ruiyu
0 siblings, 1 reply; 6+ messages in thread
From: Steele, Kelly @ 2017-12-01 17:18 UTC (permalink / raw)
To: Ni, Ruiyu, edk2-devel@lists.01.org; +Cc: Kinney, Michael D
Reviewed-by: Steele, Kelly <kelly.steele@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.kinney@intel.com>; Steele, Kelly <kelly.steele@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.ni@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Kelly Steele <kelly.steele@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/BasePerformanceLibNull.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/DxeSmmPerform
+ anceLib.inf
}
!endif
@@ -910,8 +911,6 @@ [Components.IA32]
NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
- ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
- FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.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/BasePerformanceLibNull.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/PlatformSecureLib.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/DxeSmmPerform
+ anceLib.inf
}
!endif
@@ -632,8 +637,6 @@ [Components.IA32]
NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf
NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf
- ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf
- FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf
PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] QuarkPlatformPkg: Use DpDynamicCommand to replace PerformancePkg/dp
2017-12-01 17:18 ` Steele, Kelly
@ 2017-12-02 8:44 ` Ni, Ruiyu
0 siblings, 0 replies; 6+ messages in thread
From: Ni, Ruiyu @ 2017-12-02 8:44 UTC (permalink / raw)
To: Steele, Kelly, edk2-devel@lists.01.org; +Cc: Kinney, Michael D
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.ni@intel.com>; edk2-devel@lists.01.org
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>
> Subject: RE: [PATCH 2/2] QuarkPlatformPkg: Use DpDynamicCommand to
> replace PerformancePkg/dp
>
> Reviewed-by: Steele, Kelly <kelly.steele@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.kinney@intel.com>; Steele, Kelly
> <kelly.steele@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.ni@intel.com>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Kelly Steele <kelly.steele@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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-12-02 8:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-29 8:14 [PATCH 0/2] Use DpDynamicCommand to replace PerformancePkg/dp Ruiyu Ni
2017-11-29 8:14 ` [PATCH 1/2] Vlv2TbltDevicePkg: " Ruiyu Ni
2017-11-29 8:38 ` Wei, David
2017-11-29 8:14 ` [PATCH 2/2] QuarkPlatformPkg: " Ruiyu Ni
2017-12-01 17:18 ` Steele, Kelly
2017-12-02 8:44 ` Ni, Ruiyu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox