diff options
Diffstat (limited to 'src/drivers')
-rw-r--r-- | src/drivers/i2c/tpm/cr50.c | 2 | ||||
-rw-r--r-- | src/drivers/i2c/tpm/tis.c | 2 | ||||
-rw-r--r-- | src/drivers/i2c/tpm/tis_atmel.c | 2 | ||||
-rw-r--r-- | src/drivers/i2c/tpm/tpm.c | 2 | ||||
-rw-r--r-- | src/drivers/intel/fsp1_1/romstage.c | 2 | ||||
-rw-r--r-- | src/drivers/intel/fsp2_0/memory_init.c | 2 | ||||
-rw-r--r-- | src/drivers/pc80/tpm/Makefile.inc | 6 | ||||
-rw-r--r-- | src/drivers/pc80/tpm/romstage.c | 2 | ||||
-rw-r--r-- | src/drivers/pc80/tpm/tis.c (renamed from src/drivers/pc80/tpm/tpm.c) | 2 | ||||
-rw-r--r-- | src/drivers/spi/tpm/tis.c | 2 | ||||
-rw-r--r-- | src/drivers/spi/tpm/tpm.c | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/src/drivers/i2c/tpm/cr50.c b/src/drivers/i2c/tpm/cr50.c index 0927d7fc43..96e00379c8 100644 --- a/src/drivers/i2c/tpm/cr50.c +++ b/src/drivers/i2c/tpm/cr50.c @@ -39,7 +39,7 @@ #include <device/i2c_simple.h> #include <endian.h> #include <timer.h> -#include <security/tpm/tpm.h> +#include <security/tpm/tis.h> #include "tpm.h" #define CR50_MAX_BUFSIZE 63 diff --git a/src/drivers/i2c/tpm/tis.c b/src/drivers/i2c/tpm/tis.c index ba5f0e4a10..1893d167d2 100644 --- a/src/drivers/i2c/tpm/tis.c +++ b/src/drivers/i2c/tpm/tis.c @@ -22,7 +22,7 @@ #include <device/i2c_simple.h> #include <endian.h> #include <lib.h> -#include <security/tpm/tpm.h> +#include <security/tpm/tis.h> #include "tpm.h" #include <timer.h> diff --git a/src/drivers/i2c/tpm/tis_atmel.c b/src/drivers/i2c/tpm/tis_atmel.c index d321d24558..2bea13565d 100644 --- a/src/drivers/i2c/tpm/tis_atmel.c +++ b/src/drivers/i2c/tpm/tis_atmel.c @@ -23,7 +23,7 @@ #include <device/i2c_simple.h> #include <endian.h> #include <lib.h> -#include <security/tpm/tpm.h> +#include <security/tpm/tis.h> #include <timer.h> #define RECV_TIMEOUT (1 * 1000) /* 1 second */ diff --git a/src/drivers/i2c/tpm/tpm.c b/src/drivers/i2c/tpm/tpm.c index dede671d1b..7d69861586 100644 --- a/src/drivers/i2c/tpm/tpm.c +++ b/src/drivers/i2c/tpm/tpm.c @@ -38,7 +38,7 @@ #include <device/i2c_simple.h> #include <endian.h> #include <timer.h> -#include <security/tpm/tpm.h> +#include <security/tpm/tis.h> #include "tpm.h" /* max. number of iterations after I2C NAK */ diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c index 3e96136ec9..69ea7865ea 100644 --- a/src/drivers/intel/fsp1_1/romstage.c +++ b/src/drivers/intel/fsp1_1/romstage.c @@ -36,7 +36,7 @@ #include <stage_cache.h> #include <string.h> #include <timestamp.h> -#include <security/tpm/tpm.h> +#include <security/tpm/tis.h> #include <vendorcode/google/chromeos/chromeos.h> asmlinkage void *romstage_main(FSP_INFO_HEADER *fih) diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index 18e0a2a97d..8eb1bd54ea 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -31,7 +31,7 @@ #include <string.h> #include <symbols.h> #include <timestamp.h> -#include <security/tpm/tlcl.h> +#include <security/tpm/tss.h> #include <security/vboot/vboot_common.h> #include <vb2_api.h> diff --git a/src/drivers/pc80/tpm/Makefile.inc b/src/drivers/pc80/tpm/Makefile.inc index 0068ff19a6..9d428b5e22 100644 --- a/src/drivers/pc80/tpm/Makefile.inc +++ b/src/drivers/pc80/tpm/Makefile.inc @@ -1,8 +1,8 @@ ifeq ($(CONFIG_ARCH_X86),y) -verstage-$(CONFIG_LPC_TPM) += tpm.c -romstage-$(CONFIG_LPC_TPM) += tpm.c -ramstage-$(CONFIG_LPC_TPM) += tpm.c +verstage-$(CONFIG_LPC_TPM) += tis.c +romstage-$(CONFIG_LPC_TPM) += tis.c +ramstage-$(CONFIG_LPC_TPM) += tis.c romstage-$(CONFIG_LPC_TPM) += romstage.c endif diff --git a/src/drivers/pc80/tpm/romstage.c b/src/drivers/pc80/tpm/romstage.c index 20413d8cf4..b8e4705e87 100644 --- a/src/drivers/pc80/tpm/romstage.c +++ b/src/drivers/pc80/tpm/romstage.c @@ -17,7 +17,7 @@ #include <console/cbmem_console.h> #include <console/console.h> #include <arch/acpi.h> -#include <security/tpm/tpm.h> +#include <security/tpm/tis.h> #include <reset.h> //#define EXTRA_LOGGING diff --git a/src/drivers/pc80/tpm/tpm.c b/src/drivers/pc80/tpm/tis.c index 8f1c5df0aa..9802654ee1 100644 --- a/src/drivers/pc80/tpm/tpm.c +++ b/src/drivers/pc80/tpm/tis.c @@ -32,7 +32,7 @@ #include <arch/acpi_device.h> #include <device/device.h> #include <console/console.h> -#include <security/tpm/tpm.h> +#include <security/tpm/tis.h> #include <arch/early_variables.h> #include <device/pnp.h> #include "chip.h" diff --git a/src/drivers/spi/tpm/tis.c b/src/drivers/spi/tpm/tis.c index f561a97280..40bf27dee2 100644 --- a/src/drivers/spi/tpm/tis.c +++ b/src/drivers/spi/tpm/tis.c @@ -7,7 +7,7 @@ #include <arch/early_variables.h> #include <console/console.h> #include <string.h> -#include <security/tpm/tpm.h> +#include <security/tpm/tis.h> #include "tpm.h" diff --git a/src/drivers/spi/tpm/tpm.c b/src/drivers/spi/tpm/tpm.c index c7a3ab7749..c0fee46dc7 100644 --- a/src/drivers/spi/tpm/tpm.c +++ b/src/drivers/spi/tpm/tpm.c @@ -23,7 +23,7 @@ #include <endian.h> #include <string.h> #include <timer.h> -#include <security/tpm/tpm.h> +#include <security/tpm/tis.h> #include "tpm.h" |