diff options
| author | Tom Rini <trini@konsulko.com> | 2022-01-22 15:43:36 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-22 15:43:36 -0500 |
| commit | da158ec5f2db86d88a631c05c540ba5ee1937a77 (patch) | |
| tree | 2aec2712bc2db6417fc9e5660b8a5c2e7b04ecee /include | |
| parent | e6786b0354372c8a68d01e4d633a19cdce373b70 (diff) | |
| parent | f5e9035043fb48baea93ccb3165e75f486906213 (diff) | |
| download | u-boot-da158ec5f2db86d88a631c05c540ba5ee1937a77.zip u-boot-da158ec5f2db86d88a631c05c540ba5ee1937a77.tar.gz u-boot-da158ec5f2db86d88a631c05c540ba5ee1937a77.tar.bz2 | |
Merge tag 'efi-2022-04-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efiWIP/22Jan2022
Pull request for efi-2022-04-rc1-2
Documentation:
* describe printf() format codes
UEFI
* enable more algorithms for UEFI image verification, e.g. SHA256-RSA2048
General
* simplify printing short texts for GUIDs
* provide a unit test for printing GUIDs
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_api.h | 12 | ||||
| -rw-r--r-- | include/efi_dt_fixup.h | 4 | ||||
| -rw-r--r-- | include/efi_rng.h | 4 | ||||
| -rw-r--r-- | include/efi_tcg2.h | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/include/efi_api.h b/include/efi_api.h index ec9fa89..8d5d835 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -426,6 +426,18 @@ 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) + +#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_dt_fixup.h b/include/efi_dt_fixup.h index 9066e8d..8338253 100644 --- a/include/efi_dt_fixup.h +++ b/include/efi_dt_fixup.h @@ -7,10 +7,6 @@ #include <efi_api.h> -#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 35f5967..3c62238 100644 --- a/include/efi_rng.h +++ b/include/efi_rng.h @@ -10,10 +10,6 @@ #include <efi_api.h> /* 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) diff --git a/include/efi_tcg2.h b/include/efi_tcg2.h index 50a59f9..874306d 100644 --- 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 |