From: Tom Rini Date: Wed, 8 Jul 2020 20:22:09 -0400 Subject: [PATCH] bugfix: tpm2_tis_spi: redeclaration compile error In-Reply-To: <20200706153227.5195-1-bruno.thomsen@gmail.com> References: <20200706153227.5195-1-bruno.thomsen@gmail.com> Message-ID: <20200709002209.GU1306@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Mon, Jul 06, 2020 at 05:32:27PM +0200, Bruno Thomsen wrote: > 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 > --- > drivers/tpm/tpm_tis.h | 15 --------------- > 1 file changed, 15 deletions(-) Doing it this way however breaks tpm1 support. I've taken a different patch for this issue, thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: