Don't need call SAP measure GPT table, which can be covered in SAP implementation.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9541 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 0eb59e89c8f737f2f0d16eeb4e30bde33519f959..c022c15ee015b0bc18533bb3e96a743666a2bb49 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -145,7 +145,6 @@ BdsLibBootViaBootOption (
   EFI_DEVICE_PATH_PROTOCOL  *WorkingDevicePath;\r
   EFI_ACPI_S3_SAVE_PROTOCOL *AcpiS3Save;\r
   LIST_ENTRY                TempBootLists;\r
-  EFI_SECURITY_ARCH_PROTOCOL *SecurityProtocol;\r
 \r
   //\r
   // Record the performance data for End of BDS\r
@@ -241,18 +240,6 @@ BdsLibBootViaBootOption (
     DevicePath = Option->DevicePath;\r
   }\r
 \r
-  //\r
-  // Measure GPT Table by SAP protocol.\r
-  //\r
-  Status = gBS->LocateProtocol (\r
-                  &gEfiSecurityArchProtocolGuid,\r
-                  NULL,\r
-                  (VOID**) &SecurityProtocol\r
-                  );\r
-  if (!EFI_ERROR (Status)) {\r
-    Status = SecurityProtocol->FileAuthenticationState (SecurityProtocol, 0, DevicePath);\r
-  }\r
-\r
   DEBUG_CODE_BEGIN();\r
     UINTN                     DevicePathTypeValue;\r
     CHAR16                    *HiiString;\r
@@ -326,7 +313,7 @@ BdsLibBootViaBootOption (
                   );\r
 \r
   //\r
-  // If we didn't find an image directly, we need to try as if it is a removable device boot opotion\r
+  // If we didn't find an image directly, we need to try as if it is a removable device boot option\r
   // and load the image according to the default boot behavior for removable device.\r
   //\r
   if (EFI_ERROR (Status)) {\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index acab4bda2f0d7c05f7d93ef735ecb23631c14641..2f6ba4b8e688deeb40ba2dfed929db4b633a21aa 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -107,7 +107,6 @@
   gEfiUgaDrawProtocolGuid |PcdUgaConsumeSupport # PROTOCOL SOMETIMES_CONSUMES\r
   gEfiOEMBadgingProtocolGuid                    # PROTOCOL CONSUMES\r
   gEfiHiiFontProtocolGuid                       # PROTOCOL CONSUMES\r
-  gEfiSecurityArchProtocolGuid                  # PROTOCOL CONSUMES\r
 \r
 [FeaturePcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index 5830e8068f57a466b8c36159bbf394a773d70025..f269e44eff45f811fec28dfa0aa5c159879749bc 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
@@ -39,7 +39,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/UgaDraw.h>\r
 #include <Protocol/HiiFont.h>\r
 #include <Protocol/HiiImage.h>\r
-#include <Protocol/Security.h>\r
 \r
 #include <Guid/MemoryTypeInformation.h>\r
 #include <Guid/FileInfo.h>\r