Retire TCG platform protocol, which will be replaced by PI Security Architecture protocol.

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

4 files changed, 0 insertions, 59 deletions

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index f5e45c7..1680e7d 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -48,7 +48,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/Capsule.h>

 #include <Protocol/BusSpecificDriverOverride.h>

 #include <Protocol/TcgService.h>

-#include <Protocol/TcgPlatform.h>

 #include <Guid/MemoryTypeInformation.h>

 #include <Guid/FirmwareFileSystem2.h>

 #include <Guid/HobList.h>

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index e6a126b..b749185 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -130,7 +130,6 @@
   gEfiDevicePathProtocolGuid                    ## CONSUMES

   gEfiLoadedImageProtocolGuid                   ## PRODUCES

   gEfiEbcProtocolGuid                           ## SOMETIMES_CONSUMES

-  gEfiTcgPlatformProtocolGuid			        ## CONSUMES

   gEfiLoadedImageDevicePathProtocolGuid         ## PRODUCES

 

 [FixedPcd.common]

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 68fcca4..6ca7eb5 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -621,37 +621,12 @@ CoreExitBootServices (
   )

 {

   EFI_STATUS                Status;

-  EFI_STATUS                StatusTemp;

-  EFI_TCG_PLATFORM_PROTOCOL *TcgPlatformProtocol;

-

-  //

-  // Measure invocation of ExitBootServices,

-  // which is defined by TCG_EFI_Platform_1_20_Final Specification

-  //

-  TcgPlatformProtocol = NULL;

-  Status = CoreLocateProtocol (

-             &gEfiTcgPlatformProtocolGuid,

-             NULL,

-             (VOID **) &TcgPlatformProtocol

-             );

-  if (!EFI_ERROR (Status)) {

-    Status = TcgPlatformProtocol->MeasureAction (EFI_EXIT_BOOT_SERVICES_INVOCATION);

-    ASSERT_EFI_ERROR (Status);

-  }

 

   //

   // Terminate memory services if the MapKey matches

   //

   Status = CoreTerminateMemoryMap (MapKey);

   if (EFI_ERROR (Status)) {

-    //

-    // Measure failure of ExitBootServices

-    //

-    if (TcgPlatformProtocol != NULL) {

-      StatusTemp = TcgPlatformProtocol->MeasureAction (EFI_EXIT_BOOT_SERVICES_FAILED);

-      ASSERT_EFI_ERROR (StatusTemp);

-    }

-

     return Status;

   }

 

@@ -705,14 +680,6 @@ CoreExitBootServices (
   //

   gRuntime->AtRuntime = TRUE;

 

-  //

-  // Measure success of ExitBootServices

-  //

-  if (TcgPlatformProtocol != NULL) {

-    StatusTemp = TcgPlatformProtocol->MeasureAction (EFI_EXIT_BOOT_SERVICES_SUCCEEDED);

-    ASSERT_EFI_ERROR (StatusTemp);

-  }

-

   return Status;

 }

 

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 15b474a..4acc9d8 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -191,7 +191,6 @@ CoreLoadPeImage (
   BOOLEAN                   DstBufAlocated;

   UINTN                     Size;

   UINTN                     LinkTimeBase;

-  EFI_TCG_PLATFORM_PROTOCOL *TcgPlatformProtocol;

   IMAGE_FILE_HANDLE         *FHandle;

 

   FHandle = NULL;

@@ -345,29 +344,6 @@ CoreLoadPeImage (
   }

 

   //

-  // Measure the image before applying fixup

-  //

-  Status = CoreLocateProtocol (

-             &gEfiTcgPlatformProtocolGuid,

-             NULL,

-             (VOID **) &TcgPlatformProtocol

-             );

-  if (!EFI_ERROR (Status)) {

-    FHandle = (IMAGE_FILE_HANDLE *) Image->ImageContext.Handle;

-    Status = TcgPlatformProtocol->MeasurePeImage (

-                                    BootPolicy,

-                                    (EFI_PHYSICAL_ADDRESS) (UINTN) FHandle->Source,

-                                    FHandle->SourceSize,

-                                    LinkTimeBase,

-                                    Image->ImageContext.ImageType,

-                                    Image->Info.DeviceHandle,

-                                    Image->Info.FilePath

-                                    );

-

-    ASSERT_EFI_ERROR (Status);

-  }

-

-  //

   // Relocate the image in memory

   //

   Status = PeCoffLoaderRelocateImage (&Image->ImageContext);