random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-17 22:28:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

tpm: add #ifndef to fix redeclaration build errors

Browse Source 
tpm_tis_spi.c directly includes tpm_tis.h and tpm-v2.h which both
define the same enums (see e.g. TPM_ACCESS_VALID). Add an #ifndef to
prevent redeclaration errors.

Signed-off-by: Johannes Holland <johannes.holland@infineon.com>
This commit is contained in:
Johannes Holland 2020-05-11 15:22:25 +02:00 committed by Tom Rini
parent 06bea49809
commit bedbb383e1
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/tpm/tpm_tis.h
View File

@ -104,6 +104,7 @@ struct tpm_cmd_t {
/* Max number of iterations after i2c NAK */ /* Max number of iterations after i2c NAK */
#define MAX_COUNT 3 #define MAX_COUNT 3
#ifndef __TPM_V2_H
/* /*
* Max number of iterations after i2c NAK for 'long' commands * Max number of iterations after i2c NAK for 'long' commands
* *
@ -127,5 +128,6 @@ enum tis_status {
TPM_STS_DATA_AVAIL = 0x10, TPM_STS_DATA_AVAIL = 0x10,
TPM_STS_DATA_EXPECT = 0x08, TPM_STS_DATA_EXPECT = 0x08,
}; };
#endif
#endif #endif