1) Sync EdkCompatibilityPkg with EDK 1.04. The changes includes:

  1.1) Bug fixes. (For details, please check  Documents & files: Snapshot/Release Notes at https://edk.tianocore.org/servlets/ProjectDocumentList?folderID=43&expandFolder=43&folderID=6)
  1.2) Add new UEFI protocol definitions for AbsolutePointer, FormBrowser2, HiiConfigAccess, HiiConfigRouting, HiiDatabase, HiiFont, HiiImage, HiiString, SimpleTextInputEx, DPC protocol.
  1.3) Add Smbios 2.5, 2.6 supports.

  Incompatible changes hilighted:
  1) EFI_MANAGED_NETWORK_PROTOCOL_GUID changed.
  2) EFI_IP4_IPCONFIG_DATA changed.

2) Add in EdkCompatibilityPkg/EdkCompatibilityPkg.dsc to build all libraries in this package.

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

2 files changed, 47 insertions, 4 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.c b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.c
index 2af838d532..261b145891 100644
--- a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.c
+++ b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2007, Intel Corporation                                                         

 All rights reserved. This program and the accompanying materials                          

 are licensed and made available under the terms and conditions of the BSD License         

 which accompanies this distribution.  The full text of the license may be found at        

@@ -21,10 +21,11 @@ Abstract:
 

 --*/

 

-#include <Tiano.h>

+#include "Tiano.h"

 

 #include EFI_PROTOCOL_DEFINITION(TcgService)

 

-EFI_GUID gEfiTcgProtocolGuid = EFI_TCG_PROTOCOL_GUID;

+EFI_GUID gEfiTcgProtocolGuid         = EFI_TCG_PROTOCOL_GUID;

+EFI_GUID gEfiTcgPlatformProtocolGuid = EFI_TCG_PLATFORM_PROTOCOL_GUID;

 

 EFI_GUID_STRING(&gEfiTcgServiceProtocolGuid, "TcgService", "TCG Services Protocol");

diff --git a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h
index 0a8cf7d77a..d461e95917 100644
--- a/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h
+++ b/EdkCompatibilityPkg/Foundation/Protocol/TcgService/TcgService.h
@@ -24,13 +24,27 @@ Abstract:
 #ifndef _TCG_SERVICE_PROTOCOL_H_

 #define _TCG_SERVICE_PROTOCOL_H_

 

-#include <EfiTpm.h>

+#include "EfiTpm.h"

 

 #define EFI_TCG_PROTOCOL_GUID  \

   {0xf541796d, 0xa62e, 0x4954, 0xa7, 0x75, 0x95, 0x84, 0xf6, 0x1b, 0x9c, 0xdd}

 

+#define EFI_TCG_PLATFORM_PROTOCOL_GUID  \

+  { 0x8c4c9a41, 0xbf56, 0x4627, 0x9e, 0xa, 0xc8, 0x38, 0x6d, 0x66, 0x11, 0x5c }

+

 #define TSS_EVENT_DATA_MAX_SIZE   256

 

+#define EFI_CALLING_EFI_APPLICATION         \

+  "Calling EFI Application from Boot Option"

+#define EFI_RETURNING_FROM_EFI_APPLICATOIN  \

+  "Returning from EFI Application from Boot Option"

+#define EFI_EXIT_BOOT_SERVICES_INVOCATION   \

+  "Exit Boot Services Invocation"

+#define EFI_EXIT_BOOT_SERVICES_FAILED       \

+  "Exit Boot Services Returned with Failure"

+#define EFI_EXIT_BOOT_SERVICES_SUCCEEDED    \

+  "Exit Boot Services Returned with Success"

+

 EFI_FORWARD_DECLARATION (EFI_TCG_PROTOCOL);

 

 //

@@ -125,4 +139,32 @@ typedef struct _EFI_TCG_PROTOCOL {
 

 extern EFI_GUID gEfiTcgProtocolGuid;

 

+//

+// EFI TCG Platform Protocol

+//

+typedef

+EFI_STATUS

+(EFIAPI *EFI_TCG_MEASURE_PE_IMAGE) (

+  IN      BOOLEAN                   BootPolicy,

+  IN      EFI_PHYSICAL_ADDRESS      ImageAddress,

+  IN      UINTN                     ImageSize,

+  IN      UINTN                     LinkTimeBase,

+  IN      UINT16                    ImageType,

+  IN      EFI_HANDLE                DeviceHandle,

+  IN      EFI_DEVICE_PATH_PROTOCOL  *FilePath

+  );

+

+typedef

+EFI_STATUS

+(EFIAPI *EFI_TCG_MEASURE_ACTION) (

+  IN      CHAR8                     *ActionString

+  );

+

+typedef struct tdEFI_TCG_PLATFORM_PROTOCOL {

+  EFI_TCG_MEASURE_PE_IMAGE          MeasurePeImage;

+  EFI_TCG_MEASURE_ACTION            MeasureAction;

+} EFI_TCG_PLATFORM_PROTOCOL;

+

+extern EFI_GUID                     gEfiTcgPlatformProtocolGuid;

+

 #endif