QuarkPlatformPkg: Use DpDynamicCommand to replace PerformancePkg/dp
authorRuiyu Ni <ruiyu.ni@intel.com>
Wed, 29 Nov 2017 08:12:40 +0000 (16:12 +0800)
committerRuiyu Ni <ruiyu.ni@intel.com>
Sat, 2 Dec 2017 08:40:14 +0000 (16:40 +0800)
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>
QuarkPlatformPkg/Quark.dsc
QuarkPlatformPkg/Quark.fdf
QuarkPlatformPkg/QuarkMin.dsc
QuarkPlatformPkg/QuarkMin.fdf

index 025653e..5624451 100644 (file)
   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
   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
   # 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
       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
index 19533b2..ab0f84b 100644 (file)
@@ -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
index 084f2f4..404f507 100644 (file)
 !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
   # 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
       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
index ac75199..b793fbd 100644 (file)
@@ -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