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>
Reviewed-by: Kelly Steele <kelly.steele@intel.com>

4 files changed, 31 insertions, 22 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 @@
   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 @@
   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 @@
   # 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 @@
       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..ab0f84b860 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

@@ -575,7 +575,6 @@ INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 # 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

@@ -583,6 +582,13 @@ INF  FatPkg/EnhancedFatDxe/Fat.inf
 !endif

 

 #

+# Performance Application

+#

+!if $(PERFORMANCE_ENABLE)

+INF  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf

+!endif

+

+#

 # Trusted Platform Module

 #

 !if $(MEASURED_BOOT_ENABLE)

@@ -677,9 +683,6 @@ READ_LOCK_STATUS   = TRUE
 # 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 @@
 !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 @@
   # 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 @@
       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 @@ INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 #

 INF  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf

 

+#

+# Performance Application

+#

+!if $(PERFORMANCE_ENABLE)

+INF  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf

+!endif

+

 ################################################################################

 #

 # FV Section

@@ -502,9 +509,6 @@ READ_LOCK_STATUS   = TRUE
 # Shell and Applications

 #

 INF  ShellPkg/Application/Shell/Shell.inf

-!if $(PERFORMANCE_ENABLE)

-INF  PerformancePkg/Dp_App/Dp.inf

-!endif

 

 ################################################################################

 #