efi_loader: printing TCG2 protocol GUID

We support the TCG2 protocol. Allow command efidebug to print it.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/include/efi_api.h b/include/efi_api.h
index a60d1bc416cab8d32d1051b22d78348267b78c37..8d5d835bd015eadefa93e5395cb0ed8c272632d7 100644 (file)
--- a/include/efi_api.h
+++ b/include/efi_api.h
@@ -434,6 +434,10 @@ struct efi_runtime_services {
        EFI_GUID(0xe617d64c, 0xfe08, 0x46da, 0xf4, 0xdc, \
                 0xbb, 0xd5, 0x87, 0x0c, 0x73, 0x00)
 
+#define EFI_TCG2_PROTOCOL_GUID \
+       EFI_GUID(0x607f766c, 0x7455, 0x42be, 0x93, \
+                0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f)
+
 /**
  * struct efi_configuration_table - EFI Configuration Table
  *

diff --git a/include/efi_tcg2.h b/include/efi_tcg2.h
index 50a59f9263a7462666c7307f7d9cec9481368952..874306dc112b0ec5e7137f658fee8e0222d1ffd5 100644 (file)
--- a/include/efi_tcg2.h
+++ b/include/efi_tcg2.h
@@ -19,10 +19,6 @@
 #include <efi_api.h>
 #include <tpm-v2.h>
 
-#define EFI_TCG2_PROTOCOL_GUID \
-       EFI_GUID(0x607f766c, 0x7455, 0x42be, 0x93, \
-                0x0b, 0xe4, 0xd7, 0x6d, 0xb2, 0x72, 0x0f)
-
 /* TPMV2 only */
 #define TCG2_EVENT_LOG_FORMAT_TCG_2 0x00000002
 #define EFI_TCG2_EXTEND_ONLY 0x0000000000000001

diff --git a/lib/uuid.c b/lib/uuid.c
index 3ffaab7d15c9b5c5f64e26216a899a6281d60343..24571ef5fbf0557b6aff559a0ced5aa8bbcddb65 100644 (file)
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -183,6 +183,10 @@ static const struct {
                "Device-Tree Fixup",
                EFI_DT_FIXUP_PROTOCOL_GUID,
        },
+       {
+               "TCG2",
+               EFI_TCG2_PROTOCOL_GUID,
+               },
        {
                "System Partition",
                PARTITION_SYSTEM_GUID