From 3adae64220be502cd6d522c96a3af7dd420a1a67 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sun, 16 Jan 2022 14:10:23 +0100 Subject: cmd: efidebug: simplify printing GUIDs Use "%pS" to print text representations of GUIDs. Signed-off-by: Heinrich Schuchardt --- include/efi_api.h | 8 ++++++++ include/efi_dt_fixup.h | 4 ---- include/efi_rng.h | 4 ---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/efi_api.h b/include/efi_api.h index ec9fa89a935..a60d1bc416c 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -426,6 +426,14 @@ struct efi_runtime_services { EFI_GUID(0x1e2ed096, 0x30e2, 0x4254, 0xbd, \ 0x89, 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25) +#define EFI_RNG_PROTOCOL_GUID \ + EFI_GUID(0x3152bca5, 0xeade, 0x433d, 0x86, 0x2e, \ + 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44) + +#define EFI_DT_FIXUP_PROTOCOL_GUID \ + EFI_GUID(0xe617d64c, 0xfe08, 0x46da, 0xf4, 0xdc, \ + 0xbb, 0xd5, 0x87, 0x0c, 0x73, 0x00) + /** * struct efi_configuration_table - EFI Configuration Table * diff --git a/include/efi_dt_fixup.h b/include/efi_dt_fixup.h index 9066e8dd8e1..83382537d16 100644 --- a/include/efi_dt_fixup.h +++ b/include/efi_dt_fixup.h @@ -7,10 +7,6 @@ #include -#define EFI_DT_FIXUP_PROTOCOL_GUID \ - EFI_GUID(0xe617d64c, 0xfe08, 0x46da, 0xf4, 0xdc, \ - 0xbb, 0xd5, 0x87, 0x0c, 0x73, 0x00) - #define EFI_DT_FIXUP_PROTOCOL_REVISION 0x00010000 /* Add nodes and update properties */ diff --git a/include/efi_rng.h b/include/efi_rng.h index 35f59678c7a..3c622381cbb 100644 --- a/include/efi_rng.h +++ b/include/efi_rng.h @@ -10,10 +10,6 @@ #include /* EFI random number generation protocol related GUID definitions */ -#define EFI_RNG_PROTOCOL_GUID \ - EFI_GUID(0x3152bca5, 0xeade, 0x433d, 0x86, 0x2e, \ - 0xc0, 0x1c, 0xdc, 0x29, 0x1f, 0x44) - #define EFI_RNG_ALGORITHM_RAW \ EFI_GUID(0xe43176d7, 0xb6e8, 0x4827, 0xb7, 0x84, \ 0x7f, 0xfd, 0xc4, 0xb6, 0x85, 0x61) -- cgit v1.3.1 From 38040a63a3e838a1eeb56c7d18875be485b14f5c Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sun, 16 Jan 2022 17:46:38 +0100 Subject: efi_loader: printing TCG2 protocol GUID We support the TCG2 protocol. Allow command efidebug to print it. Signed-off-by: Heinrich Schuchardt --- include/efi_api.h | 4 ++++ include/efi_tcg2.h | 4 ---- lib/uuid.c | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/efi_api.h b/include/efi_api.h index a60d1bc416c..8d5d835bd01 100644 --- 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 50a59f9263a..874306dc112 100644 --- a/include/efi_tcg2.h +++ b/include/efi_tcg2.h @@ -19,10 +19,6 @@ #include #include -#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 3ffaab7d15c..24571ef5fbf 100644 --- 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 -- cgit v1.3.1