SecurityPkg Tcg2Config: Move common definitions to new Tcg2Internal.h

[mirror_edk2.git] / SecurityPkg / Tcg / Tcg2Config / Tcg2ConfigNvData.h

diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h
index d0a124684f011682ab28c2de2c9ccc3c84e5fa71..a91c0528506d355fabbfa271ac35300c10841286 100644 (file)
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigNvData.h
@@ -13,15 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Guid/Tcg2ConfigHii.h>\r
 #include <IndustryStandard/TcgPhysicalPresence.h>\r
 \r
-//\r
-// BUGBUG: In order to pass VfrCompiler, we have to redefine below MACRO, which already in <Protocol/Tcg2Protocol.h>.\r
-//\r
-#ifndef __TCG2_H__\r
-#define EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2       0x00000001\r
-#define EFI_TCG2_EVENT_LOG_FORMAT_TCG_2         0x00000002\r
-#endif\r
-#define EFI_TCG2_EVENT_LOG_FORMAT_ALL           (EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2 | EFI_TCG2_EVENT_LOG_FORMAT_TCG_2)\r
-\r
 #define TCG2_CONFIGURATION_VARSTORE_ID  0x0001\r
 #define TCG2_CONFIGURATION_INFO_VARSTORE_ID     0x0002\r
 #define TCG2_VERSION_VARSTORE_ID        0x0003\r
@@ -55,9 +46,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define TPM_DEVICE_INTERFACE_MAX       TPM_DEVICE_INTERFACE_PTP_FIFO\r
 #define TPM_DEVICE_INTERFACE_DEFAULT   TPM_DEVICE_INTERFACE_PTP_CRB\r
 \r
-#define TCG2_PROTOCOL_VERSION_DEFAULT        0x0001\r
-#define EFI_TCG2_EVENT_LOG_FORMAT_DEFAULT    EFI_TCG2_EVENT_LOG_FORMAT_TCG_1_2\r
-\r
 #define TCG2_PPI_VERSION_1_2                    0x322E31  // "1.2"\r
 #define TCG2_PPI_VERSION_1_3                    0x332E31  // "1.3"\r
 \r
@@ -97,27 +85,4 @@ typedef struct {
 #define TCG2_DEVICE_DETECTION_NAME  L"TCG2_DEVICE_DETECTION"\r
 #define TCG2_VERSION_NAME           L"TCG2_VERSION"\r
 \r
-#define TPM_INSTANCE_ID_LIST  { \\r
-  {TPM_DEVICE_INTERFACE_NONE,           TPM_DEVICE_NULL},      \\r
-  {TPM_DEVICE_INTERFACE_TPM12,          TPM_DEVICE_1_2},       \\r
-  {TPM_DEVICE_INTERFACE_TPM20_DTPM,     TPM_DEVICE_2_0_DTPM},  \\r
-}\r
-\r
-//\r
-// BUGBUG: In order to pass VfrCompiler, we have to redefine GUID here.\r
-//\r
-#ifndef __BASE_H__\r
-typedef struct {\r
-  UINT32  Data1;\r
-  UINT16  Data2;\r
-  UINT16  Data3;\r
-  UINT8   Data4[8];\r
-} GUID;\r
-#endif\r
-\r
-typedef struct {\r
-  GUID       TpmInstanceGuid;\r
-  UINT8      TpmDevice;\r
-} TPM_INSTANCE_ID;\r
-\r
 #endif\r