summaryrefslogtreecommitdiff
path: root/src/drivers/crb
diff options
context:
space:
mode:
authorSergii Dmytruk <sergii.dmytruk@3mdeb.com>2022-11-01 00:48:43 +0200
committerFelix Held <felix-coreboot@felixheld.de>2024-04-16 13:52:14 +0000
commit3e5cefcc45d7ef7da9fd9b6ecc499a05f8134039 (patch)
tree676b2369f6559b7d0028aaafc0c9b84af798ade6 /src/drivers/crb
parent7c75f8e5b2c3877487b424a1523c1e2a0caa4111 (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/crb')
-rw-r--r--src/drivers/crb/tis.c2
-rw-r--r--src/drivers/crb/tpm.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c
index 1b398f74f4..3893917118 100644
--- a/src/drivers/crb/tis.c
+++ b/src/drivers/crb/tis.c
@@ -46,7 +46,7 @@ static tpm_result_t crb_tpm_sendrecv(const uint8_t *sendbuf, size_t sbuf_size, u
return TPM_SUCCESS;
}
-tis_sendrecv_fn tis_probe(enum tpm_family *family)
+tis_sendrecv_fn crb_tis_probe(enum tpm_family *family)
{
struct crb_tpm_info info;
diff --git a/src/drivers/crb/tpm.h b/src/drivers/crb/tpm.h
index fbe390167d..aaf63a4a35 100644
--- a/src/drivers/crb/tpm.h
+++ b/src/drivers/crb/tpm.h
@@ -1,6 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause */
/* This is a driver for a Command Response Buffer Interface */
+#include <security/tpm/tis.h>
#include <security/tpm/tss_errors.h>
/* CRB driver */
@@ -65,3 +66,5 @@ void crb_tpm_get_info(struct crb_tpm_info *crb_tpm_info);
size_t crb_tpm_process_command(const void *tpm2_command, size_t command_size,
void *tpm2_response, size_t max_response);
bool crb_tpm_is_active(void);
+
+tis_sendrecv_fn crb_tis_probe(enum tpm_family *family);