diff options
| author | Sergii Dmytruk <sergii.dmytruk@3mdeb.com> | 2022-11-01 00:48:43 +0200 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2024-04-16 13:52:14 +0000 |
| commit | 3e5cefcc45d7ef7da9fd9b6ecc499a05f8134039 (patch) | |
| tree | 676b2369f6559b7d0028aaafc0c9b84af798ade6 /src/drivers/i2c | |
| parent | 7c75f8e5b2c3877487b424a1523c1e2a0caa4111 (diff) | |
security/tpm: support compiling in multiple TPM drivers
Starting from here CONFIG_TPM1 and CONFIG_TPM2 are no longer mutually
exclusive.
Change-Id: I44c5a1d825afe414c2f5c2c90f4cfe41ba9bef5f
Ticket: https://ticket.coreboot.org/issues/433
Signed-off-by: Sergii Dmytruk <sergii.dmytruk@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/69162
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/drivers/i2c')
| -rw-r--r-- | src/drivers/i2c/tpm/tis.c | 2 | ||||
| -rw-r--r-- | src/drivers/i2c/tpm/tis_atmel.c | 4 | ||||
| -rw-r--r-- | src/drivers/i2c/tpm/tpm.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/drivers/i2c/tpm/tis.c b/src/drivers/i2c/tpm/tis.c index fd09240494..1fba61a12f 100644 --- a/src/drivers/i2c/tpm/tis.c +++ b/src/drivers/i2c/tpm/tis.c @@ -118,7 +118,7 @@ static tpm_result_t i2c_tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, return TPM_SUCCESS; } -tis_sendrecv_fn tis_probe(enum tpm_family *family) +tis_sendrecv_fn i2c_tis_probe(enum tpm_family *family) { if (tpm_vendor_probe(CONFIG_DRIVER_TPM_I2C_BUS, CONFIG_DRIVER_TPM_I2C_ADDR, family)) return NULL; diff --git a/src/drivers/i2c/tpm/tis_atmel.c b/src/drivers/i2c/tpm/tis_atmel.c index a0bbf33fc4..ad5e7f37b7 100644 --- a/src/drivers/i2c/tpm/tis_atmel.c +++ b/src/drivers/i2c/tpm/tis_atmel.c @@ -12,6 +12,8 @@ #include <timer.h> #include <types.h> +#include "tpm.h" + #define RECV_TIMEOUT (1 * 1000) /* 1 second */ #define XMIT_TIMEOUT (1 * 1000) /* 1 second */ #define SLEEP_DURATION 1000 /* microseconds */ @@ -107,7 +109,7 @@ static tpm_result_t i2c_tis_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, return TPM_SUCCESS; } -tis_sendrecv_fn tis_probe(enum tpm_family *family) +tis_sendrecv_fn i2c_tis_probe(enum tpm_family *family) { /* * Can't query version or really anything as the device doesn't support diff --git a/src/drivers/i2c/tpm/tpm.h b/src/drivers/i2c/tpm/tpm.h index 46935e2495..ba78a42290 100644 --- a/src/drivers/i2c/tpm/tpm.h +++ b/src/drivers/i2c/tpm/tpm.h @@ -56,4 +56,6 @@ tpm_result_t tpm_vendor_probe(unsigned int bus, uint32_t addr, enum tpm_family * tpm_result_t tpm_vendor_init(struct tpm_chip *chip, unsigned int bus, uint32_t dev_addr); +tis_sendrecv_fn i2c_tis_probe(enum tpm_family *family); + #endif /* __DRIVERS_TPM_SLB9635_I2C_TPM_H__ */ |