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>

diff --git a/QuarkPlatformPkg/Quark.dsc b/QuarkPlatformPkg/Quark.dsc
index 025653eee5088d29bff213bd9333cd3a7aa34c42..5624451e12b703c41ba462d609429b7b1ac96312 100644 (file)
--- a/QuarkPlatformPkg/Quark.dsc
+++ b/QuarkPlatformPkg/Quark.dsc
@@ -163,6 +163,9 @@
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
 !endif\r
 \r
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+\r
   OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
@@ -864,9 +867,6 @@
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
   FatPkg/EnhancedFatDxe/Fat.inf\r
-!if $(PERFORMANCE_ENABLE)\r
-  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
-!endif\r
 \r
   #\r
   # Capsule update\r
@@ -887,10 +887,11 @@
   # Performance Application\r
   #\r
 !if $(PERFORMANCE_ENABLE)\r
-  PerformancePkg/Dp_App/Dp.inf {\r
+  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {\r
+    <PcdsFixedAtBuild>\r
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
     <LibraryClasses>\r
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+      PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf\r
   }\r
 !endif\r
 \r
@@ -910,8 +911,6 @@
       NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf\r
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf\r
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf\r
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
       BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf\r
 \r

diff --git a/QuarkPlatformPkg/Quark.fdf b/QuarkPlatformPkg/Quark.fdf
index 19533b228153bd3a4a1250877d36f5334fc82e6f..ab0f84b860872b40c6096ee833dda1b86d829110 100644 (file)
--- a/QuarkPlatformPkg/Quark.fdf
+++ b/QuarkPlatformPkg/Quark.fdf
@@ -2,7 +2,7 @@
 # FDF file of Clanton Peak CRB platform with 32-bit DXE\r
 #\r
 # This package provides QuarkNcSocId platform specific modules.\r
-# Copyright (c) 2013 - 2016 Intel Corporation.\r
+# Copyright (c) 2013 - 2017 Intel Corporation.\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -575,13 +575,19 @@ INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 # File System Modules\r
 #\r
 !if $(PERFORMANCE_ENABLE)\r
-INF  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 !else\r
 INF  MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
 INF  MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
 INF  FatPkg/EnhancedFatDxe/Fat.inf\r
 !endif\r
 \r
+#\r
+# Performance Application\r
+#\r
+!if $(PERFORMANCE_ENABLE)\r
+INF  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf\r
+!endif\r
+\r
 #\r
 # Trusted Platform Module\r
 #\r
@@ -677,9 +683,6 @@ READ_LOCK_STATUS   = TRUE
 # Shell and Applications\r
 #\r
 INF  RuleOverride = TIANOCOMPRESSED ShellPkg/Application/Shell/Shell.inf\r
-!if $(PERFORMANCE_ENABLE)\r
-INF  RuleOverride = TIANOCOMPRESSED PerformancePkg/Dp_App/Dp.inf\r
-!endif\r
 \r
 !if $(CAPSULE_ENABLE) || $(RECOVERY_ENABLE)\r
 \r

diff --git a/QuarkPlatformPkg/QuarkMin.dsc b/QuarkPlatformPkg/QuarkMin.dsc
index 084f2f4e8ffaf249715f440f86bddd530ff69b50..404f5079662b7daed0d36160331508478b86ce52 100644 (file)
--- a/QuarkPlatformPkg/QuarkMin.dsc
+++ b/QuarkPlatformPkg/QuarkMin.dsc
@@ -150,6 +150,10 @@
 !else\r
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
 !endif\r
+\r
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+\r
 !if $(SECURE_BOOT_ENABLE)\r
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf\r
   PlatformSecureLib|QuarkPlatformPkg/Library/PlatformSecureLib/PlatformSecureLib.inf\r
@@ -614,10 +618,11 @@
   # Performance Application\r
   #\r
 !if $(PERFORMANCE_ENABLE)\r
-  PerformancePkg/Dp_App/Dp.inf {\r
+  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf {\r
+    <PcdsFixedAtBuild>\r
+      gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
     <LibraryClasses>\r
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+      PerformanceLib|MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf\r
   }\r
 !endif\r
 \r
@@ -632,8 +637,6 @@
       NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf\r
       NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf\r
       HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf\r
-      ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
-      FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
       PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
       BcfgCommandLib|ShellPkg/Library/UefiShellBcfgCommandLib/UefiShellBcfgCommandLib.inf\r
 \r

diff --git a/QuarkPlatformPkg/QuarkMin.fdf b/QuarkPlatformPkg/QuarkMin.fdf
index ac751993d0dcce150e3ae0ed0ce3182ee6cd1a2a..b793fbd9a34042c00798acce01f4dd7363abafdb 100644 (file)
--- a/QuarkPlatformPkg/QuarkMin.fdf
+++ b/QuarkPlatformPkg/QuarkMin.fdf
@@ -2,7 +2,7 @@
 # FDF file of Clanton Peak CRB platform with 32-bit DXE\r
 #\r
 # This package provides QuarkNcSocId platform specific modules.\r
-# Copyright (c) 2013 - 2015 Intel Corporation.\r
+# Copyright (c) 2013 - 2017 Intel Corporation.\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -435,6 +435,13 @@ INF  MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
 #\r
 INF  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
 \r
+#\r
+# Performance Application\r
+#\r
+!if $(PERFORMANCE_ENABLE)\r
+INF  ShellPkg/DynamicCommand/DpDynamicCommand/DpDynamicCommand.inf\r
+!endif\r
+\r
 ################################################################################\r
 #\r
 # FV Section\r
@@ -502,9 +509,6 @@ READ_LOCK_STATUS   = TRUE
 # Shell and Applications\r
 #\r
 INF  ShellPkg/Application/Shell/Shell.inf\r
-!if $(PERFORMANCE_ENABLE)\r
-INF  PerformancePkg/Dp_App/Dp.inf\r
-!endif\r
 \r
 ################################################################################\r
 #\r