[PATCH] bugfix: tpm2_tis_spi: redeclaration compile error

Bruno Thomsen bruno.thomsen at gmail.com
Mon Jul 6 17:32:27 CEST 2020


tpm2_tis_spi driver fails to compile with errors like this:

drivers/tpm/tpm_tis.h:117:2: error: redeclaration of enumerator 'TPM_ACCESS_VALID'
drivers/tpm/tpm_tis.h:118:2: error: redeclaration of enumerator 'TPM_ACCESS_ACTIVE_LOCALITY'
drivers/tpm/tpm_tis.h:119:2: error: redeclaration of enumerator 'TPM_ACCESS_REQUEST_PENDING'
drivers/tpm/tpm_tis.h:120:2: error: redeclaration of enumerator 'TPM_ACCESS_REQUEST_USE'
drivers/tpm/tpm_tis.h:124:2: error: redeclaration of enumerator 'TPM_STS_VALID'
drivers/tpm/tpm_tis.h:125:2: error: redeclaration of enumerator 'TPM_STS_COMMAND_READY'
drivers/tpm/tpm_tis.h:126:2: error: redeclaration of enumerator 'TPM_STS_GO'
drivers/tpm/tpm_tis.h:127:2: error: redeclaration of enumerator 'TPM_STS_DATA_AVAIL'
drivers/tpm/tpm_tis.h:128:2: error: redeclaration of enumerator 'TPM_STS_DATA_EXPECT'

This is due to redeclaration of 9 values in tis_access and tis_status enums
from tpm_tis.h. Defines are now declared in include/tpm-v2.h, so removing
duplicates from tpm_tis.h.

Signed-off-by: Bruno Thomsen <bruno.thomsen at gmail.com>
---
 drivers/tpm/tpm_tis.h | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/drivers/tpm/tpm_tis.h b/drivers/tpm/tpm_tis.h
index 947585f8e3..4043f1aeaf 100644
--- a/drivers/tpm/tpm_tis.h
+++ b/drivers/tpm/tpm_tis.h
@@ -113,19 +113,4 @@ struct tpm_cmd_t {
  */
 #define MAX_COUNT_LONG		50
 
-enum tis_access {
-	TPM_ACCESS_VALID		= 0x80,
-	TPM_ACCESS_ACTIVE_LOCALITY	= 0x20,
-	TPM_ACCESS_REQUEST_PENDING	= 0x04,
-	TPM_ACCESS_REQUEST_USE		= 0x02,
-};
-
-enum tis_status {
-	TPM_STS_VALID			= 0x80,
-	TPM_STS_COMMAND_READY		= 0x40,
-	TPM_STS_GO			= 0x20,
-	TPM_STS_DATA_AVAIL		= 0x10,
-	TPM_STS_DATA_EXPECT		= 0x08,
-};
-
 #endif

base-commit: 04da1cd8076b44ff49a79b7fe048a9e8e56b5f60
-- 
2.26.2



More information about the U-Boot mailing list