SignedCapsulePkg: Remove redundant things in inf,.h and .c files

Two redundant library classes have been removed.
The redundant function "IsSystemFmp" has been removed.
https://bugzilla.tianocore.org/show_bug.cgi?id=1067

v2: Remove DxeServicesLib from SystemFirmwareUpdateDxe.inf.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: shenglei <shenglei.zhang@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
index 7f7a9a198277767ec06044e97b6ba690c93875ff..8e16763597d71033c2859817e9a24b1177871245 100644 (file)
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareCommonDxe.c
@@ -343,31 +343,4 @@ InitializePrivateData (
   return EFI_SUCCESS;\r
 }\r
 \r
-/**\r
-  Return if this FMP is a system FMP or a device FMP, based upon FmpImageInfo.\r
-\r
-  @param[in] FmpImageInfo A pointer to EFI_FIRMWARE_IMAGE_DESCRIPTOR\r
-\r
-  @retval TRUE  It is a system FMP.\r
-  @retval FALSE It is a device FMP.\r
-**/\r
-BOOLEAN\r
-IsSystemFmp (\r
-  IN EFI_FIRMWARE_IMAGE_DESCRIPTOR   *FmpImageInfo\r
-  )\r
-{\r
-  GUID      *Guid;\r
-  UINTN     Count;\r
-  UINTN     Index;\r
-\r
-  Guid = PcdGetPtr(PcdSystemFmpCapsuleImageTypeIdGuid);\r
-  Count = PcdGetSize(PcdSystemFmpCapsuleImageTypeIdGuid) / sizeof(GUID);\r
 \r
-  for (Index = 0; Index < Count; Index++, Guid++) {\r
-    if (CompareGuid(&FmpImageInfo->ImageTypeId, Guid)) {\r
-      return TRUE;\r
-    }\r
-  }\r
-\r
-  return FALSE;\r
-}\r

diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h
index 999b2b2501e9c7ae5fe2eab8371533c449d5b8be..cd6601e8152e7dda54ad6b5034181e4bef7fb83c 100644 (file)
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareDxe.h
@@ -36,7 +36,6 @@
 #include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/DevicePathLib.h>\r
 #include <Library/HobLib.h>\r
-#include <Library/DxeServicesLib.h>\r
 #include <Library/DxeServicesTableLib.h>\r
 #include <Library/PlatformFlashAccessLib.h>\r
 #include <Library/EdkiiSystemCapsuleLib.h>\r

diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
index cc9614ef14b555c8a3dff82484bbc99e5f94f7a9..b15736cf0dfa1a35c4632d6f11b5937a2e91627b 100644 (file)
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.inf
@@ -50,9 +50,7 @@
   HobLib\r
   UefiRuntimeServicesTableLib\r
   UefiDriverEntryPoint\r
-  DxeServicesLib\r
   DxeServicesTableLib\r
-  PrintLib\r
   EdkiiSystemCapsuleLib\r
 \r
 [Pcd]\r

diff --git a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
index 2695fb6eb579a1b19079d3ff0f4286170c1c05ca..7ddea3679e3643f3df26b8a402c8082f9d78df52 100644 (file)
--- a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
+++ b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareUpdateDxe.inf
@@ -51,7 +51,6 @@
   HobLib\r
   UefiRuntimeServicesTableLib\r
   UefiDriverEntryPoint\r
-  DxeServicesLib\r
   EdkiiSystemCapsuleLib\r
   PlatformFlashAccessLib\r
   IniParsingLib\r