| Message ID | 20240622143601.187723-4-ilias.apalodimas@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | The great TCG deduplication saga | expand |
On 22.06.24 16:35, Ilias Apalodimas wrote: > commit 97707f12fdab ("tpm: Support boot measurements") moved some of the > EFI TCG code to the TPM subsystem. Those definitions are now in tpm-v2.h. > Let's remove the duplicate entries The constants are not duplicate but unused. 97707f12fdab introduced different constant names (TPM2_ALG_*). Otherwise Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > > Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> > --- > include/efi_tcg2.h | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/include/efi_tcg2.h b/include/efi_tcg2.h > index a75b5a35b6e7..54490969b2d1 100644 > --- a/include/efi_tcg2.h > +++ b/include/efi_tcg2.h > @@ -25,14 +25,6 @@ > #define PE_COFF_IMAGE 0x0000000000000010 > > #define EFI_TCG2_MAX_PCR_INDEX 23 > - > -/* Algorithm Registry */ > -#define EFI_TCG2_BOOT_HASH_ALG_SHA1 0x00000001 > -#define EFI_TCG2_BOOT_HASH_ALG_SHA256 0x00000002 > -#define EFI_TCG2_BOOT_HASH_ALG_SHA384 0x00000004 > -#define EFI_TCG2_BOOT_HASH_ALG_SHA512 0x00000008 > -#define EFI_TCG2_BOOT_HASH_ALG_SM3_256 0x00000010 > - > #define EFI_TCG2_FINAL_EVENTS_TABLE_VERSION 1 > > #define TPM2_EVENT_LOG_SIZE CONFIG_EFI_TCG2_PROTOCOL_EVENTLOG_SIZE
diff --git a/include/efi_tcg2.h b/include/efi_tcg2.h index a75b5a35b6e7..54490969b2d1 100644 --- a/include/efi_tcg2.h +++ b/include/efi_tcg2.h @@ -25,14 +25,6 @@ #define PE_COFF_IMAGE 0x0000000000000010 #define EFI_TCG2_MAX_PCR_INDEX 23 - -/* Algorithm Registry */ -#define EFI_TCG2_BOOT_HASH_ALG_SHA1 0x00000001 -#define EFI_TCG2_BOOT_HASH_ALG_SHA256 0x00000002 -#define EFI_TCG2_BOOT_HASH_ALG_SHA384 0x00000004 -#define EFI_TCG2_BOOT_HASH_ALG_SHA512 0x00000008 -#define EFI_TCG2_BOOT_HASH_ALG_SM3_256 0x00000010 - #define EFI_TCG2_FINAL_EVENTS_TABLE_VERSION 1 #define TPM2_EVENT_LOG_SIZE CONFIG_EFI_TCG2_PROTOCOL_EVENTLOG_SIZE
commit 97707f12fdab ("tpm: Support boot measurements") moved some of the EFI TCG code to the TPM subsystem. Those definitions are now in tpm-v2.h. Let's remove the duplicate entries Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> --- include/efi_tcg2.h | 8 -------- 1 file changed, 8 deletions(-)