<p>Philipp Deppenwiese has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22104">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">security/tpm: Change TPM naming for different layers.<br><br>* Rename tlcl* to tss* as tpm software stack layer.<br>* Rename tis/tpm.c to tddl.c in the TPM driver implementations.<br>* Fix inconsistent naming.<br><br>Change-Id: I206dd6a32dbd303a6d4d987e424407ebf5c518fa<br>Signed-off-by: Philipp Deppenwiese <zaolin@das-labor.org><br>---<br>M src/cpu/intel/haswell/romstage.c<br>M src/drivers/i2c/tpm/Makefile.inc<br>M src/drivers/i2c/tpm/cr50.c<br>R src/drivers/i2c/tpm/tddl.c<br>R src/drivers/i2c/tpm/tddl_atmel.c<br>M src/drivers/i2c/tpm/tpm.c<br>M src/drivers/intel/fsp1_1/romstage.c<br>M src/drivers/intel/fsp2_0/memory_init.c<br>M src/drivers/pc80/tpm/Makefile.inc<br>M src/drivers/pc80/tpm/romstage.c<br>R src/drivers/pc80/tpm/tddl.c<br>M src/drivers/spi/tpm/Makefile.inc<br>R src/drivers/spi/tpm/tddl.c<br>M src/drivers/spi/tpm/tpm.c<br>M src/mainboard/asus/kgpe-d16/romstage.c<br>M src/mainboard/google/gru/chromeos.c<br>M src/mainboard/google/link/romstage.c<br>M src/mainboard/google/oak/tpm_tis.c<br>M src/mainboard/google/parrot/romstage.c<br>M src/mainboard/google/stout/romstage.c<br>M src/mainboard/intel/emeraldlake2/romstage.c<br>M src/mainboard/lenovo/x201/romstage.c<br>M src/mainboard/pcengines/apu2/romstage.c<br>M src/mainboard/samsung/lumpy/romstage.c<br>M src/mainboard/samsung/stumpy/romstage.c<br>M src/northbridge/intel/sandybridge/romstage.c<br>M src/security/tpm/Makefile.inc<br>R src/security/tpm/tcg-1.2/tss.c<br>R src/security/tpm/tcg-1.2/tss_internal.h<br>R src/security/tpm/tcg-1.2/tss_structures.h<br>R src/security/tpm/tcg-2.0/tss.c<br>R src/security/tpm/tcg-2.0/tss_marshaling.c<br>R src/security/tpm/tcg-2.0/tss_marshaling.h<br>R src/security/tpm/tcg-2.0/tss_structures.h<br>R src/security/tpm/tddl.h<br>R src/security/tpm/tss.h<br>R src/security/tpm/tss_error_messages.h<br>M src/security/vboot/secdata_mock.c<br>M src/security/vboot/secdata_tpm.c<br>M src/soc/intel/baytrail/romstage/romstage.c<br>M src/soc/intel/braswell/romstage/romstage.c<br>M src/soc/intel/broadwell/romstage/romstage.c<br>M src/soc/intel/common/tpm_tis.c<br>M src/vendorcode/google/chromeos/cr50_enable_update.c<br>M src/vendorcode/google/chromeos/tpm2.c<br>45 files changed, 83 insertions(+), 83 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/04/22104/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c<br>index ffbfbdf..4d9f1a3 100644<br>--- a/src/cpu/intel/haswell/romstage.c<br>+++ b/src/cpu/intel/haswell/romstage.c<br>@@ -42,7 +42,7 @@<br> #include "northbridge/intel/haswell/raminit.h"<br> #include "southbridge/intel/lynxpoint/pch.h"<br> #include "southbridge/intel/lynxpoint/me.h"<br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> <br> static inline void reset_system(void)<br> {<br>diff --git a/src/drivers/i2c/tpm/Makefile.inc b/src/drivers/i2c/tpm/Makefile.inc<br>index afcb33b..26bb95c 100644<br>--- a/src/drivers/i2c/tpm/Makefile.inc<br>+++ b/src/drivers/i2c/tpm/Makefile.inc<br>@@ -1,13 +1,13 @@<br> <br>-ramstage-$(CONFIG_DRIVER_TIS_DEFAULT) += tis.c<br>-romstage-$(CONFIG_DRIVER_TIS_DEFAULT) += tis.c<br>-verstage-$(CONFIG_DRIVER_TIS_DEFAULT) += tis.c<br>-bootblock-$(CONFIG_DRIVER_TIS_DEFAULT) += tis.c<br>+ramstage-$(CONFIG_DRIVER_TIS_DEFAULT) += tddl.c<br>+romstage-$(CONFIG_DRIVER_TIS_DEFAULT) += tddl.c<br>+verstage-$(CONFIG_DRIVER_TIS_DEFAULT) += tddl.c<br>+bootblock-$(CONFIG_DRIVER_TIS_DEFAULT) += tddl.c<br> <br>-ramstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tis_atmel.c<br>-romstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tis_atmel.c<br>-verstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tis_atmel.c<br>-bootblock-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tis_atmel.c<br>+ramstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tddl_atmel.c<br>+romstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tddl_atmel.c<br>+verstage-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tddl_atmel.c<br>+bootblock-$(CONFIG_MAINBOARD_HAS_I2C_TPM_ATMEL) += tddl_atmel.c<br> <br> ramstage-$(CONFIG_I2C_TPM_GENERIC) += tpm.c<br> romstage-$(CONFIG_I2C_TPM_GENERIC) += tpm.c<br>diff --git a/src/drivers/i2c/tpm/cr50.c b/src/drivers/i2c/tpm/cr50.c<br>index 4a1b219..676d2c5 100644<br>--- a/src/drivers/i2c/tpm/cr50.c<br>+++ b/src/drivers/i2c/tpm/cr50.c<br>@@ -39,7 +39,7 @@<br> #include <device/i2c_simple.h><br> #include <endian.h><br> #include <timer.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include "tpm.h"<br> <br> #define CR50_MAX_BUFSIZE   63<br>diff --git a/src/drivers/i2c/tpm/tis.c b/src/drivers/i2c/tpm/tddl.c<br>similarity index 98%<br>rename from src/drivers/i2c/tpm/tis.c<br>rename to src/drivers/i2c/tpm/tddl.c<br>index ba5f0e4..8bf4324 100644<br>--- a/src/drivers/i2c/tpm/tis.c<br>+++ b/src/drivers/i2c/tpm/tddl.c<br>@@ -22,7 +22,7 @@<br> #include <device/i2c_simple.h><br> #include <endian.h><br> #include <lib.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include "tpm.h"<br> #include <timer.h><br> <br>diff --git a/src/drivers/i2c/tpm/tis_atmel.c b/src/drivers/i2c/tpm/tddl_atmel.c<br>similarity index 98%<br>rename from src/drivers/i2c/tpm/tis_atmel.c<br>rename to src/drivers/i2c/tpm/tddl_atmel.c<br>index d321d24..5417b94 100644<br>--- a/src/drivers/i2c/tpm/tis_atmel.c<br>+++ b/src/drivers/i2c/tpm/tddl_atmel.c<br>@@ -23,7 +23,7 @@<br> #include <device/i2c_simple.h><br> #include <endian.h><br> #include <lib.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include <timer.h><br> <br> #define RECV_TIMEOUT            (1 * 1000)  /* 1 second */<br>diff --git a/src/drivers/i2c/tpm/tpm.c b/src/drivers/i2c/tpm/tpm.c<br>index dede671..ad51900 100644<br>--- a/src/drivers/i2c/tpm/tpm.c<br>+++ b/src/drivers/i2c/tpm/tpm.c<br>@@ -38,7 +38,7 @@<br> #include <device/i2c_simple.h><br> #include <endian.h><br> #include <timer.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include "tpm.h"<br> <br> /* max. number of iterations after I2C NAK */<br>diff --git a/src/drivers/intel/fsp1_1/romstage.c b/src/drivers/intel/fsp1_1/romstage.c<br>index 751d3d0..898241f 100644<br>--- a/src/drivers/intel/fsp1_1/romstage.c<br>+++ b/src/drivers/intel/fsp1_1/romstage.c<br>@@ -37,7 +37,7 @@<br> #include <stage_cache.h><br> #include <string.h><br> #include <timestamp.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include <vendorcode/google/chromeos/chromeos.h><br> <br> asmlinkage void *romstage_main(FSP_INFO_HEADER *fih)<br>diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c<br>index dbbe5c6..61b070a 100644<br>--- a/src/drivers/intel/fsp2_0/memory_init.c<br>+++ b/src/drivers/intel/fsp2_0/memory_init.c<br>@@ -31,7 +31,7 @@<br> #include <string.h><br> #include <symbols.h><br> #include <timestamp.h><br>-#include <security/tpm/tlcl.h><br>+#include <security/tpm/tss.h><br> #include <security/vboot/vboot_common.h><br> #include <vb2_api.h><br> <br>diff --git a/src/drivers/pc80/tpm/Makefile.inc b/src/drivers/pc80/tpm/Makefile.inc<br>index 0068ff1..b15207c 100644<br>--- a/src/drivers/pc80/tpm/Makefile.inc<br>+++ b/src/drivers/pc80/tpm/Makefile.inc<br>@@ -1,8 +1,8 @@<br> ifeq ($(CONFIG_ARCH_X86),y)<br> <br>-verstage-$(CONFIG_LPC_TPM) += tpm.c<br>-romstage-$(CONFIG_LPC_TPM) += tpm.c<br>-ramstage-$(CONFIG_LPC_TPM) += tpm.c<br>+verstage-$(CONFIG_LPC_TPM) += tddl.c<br>+romstage-$(CONFIG_LPC_TPM) += tddl.c<br>+ramstage-$(CONFIG_LPC_TPM) += tddl.c<br> romstage-$(CONFIG_LPC_TPM) += romstage.c<br> <br> endif<br>diff --git a/src/drivers/pc80/tpm/romstage.c b/src/drivers/pc80/tpm/romstage.c<br>index 20413d8..f33dec8 100644<br>--- a/src/drivers/pc80/tpm/romstage.c<br>+++ b/src/drivers/pc80/tpm/romstage.c<br>@@ -17,7 +17,7 @@<br> #include <console/cbmem_console.h><br> #include <console/console.h><br> #include <arch/acpi.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include <reset.h><br> <br> //#define EXTRA_LOGGING<br>diff --git a/src/drivers/pc80/tpm/tpm.c b/src/drivers/pc80/tpm/tddl.c<br>similarity index 99%<br>rename from src/drivers/pc80/tpm/tpm.c<br>rename to src/drivers/pc80/tpm/tddl.c<br>index 83abb4e..2c78684 100644<br>--- a/src/drivers/pc80/tpm/tpm.c<br>+++ b/src/drivers/pc80/tpm/tddl.c<br>@@ -32,7 +32,7 @@<br> #include <arch/acpi_device.h><br> #include <device/device.h><br> #include <console/console.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include <arch/early_variables.h><br> #include <device/pnp.h><br> #include "chip.h"<br>diff --git a/src/drivers/spi/tpm/Makefile.inc b/src/drivers/spi/tpm/Makefile.inc<br>index cc7d715..faf3fca 100644<br>--- a/src/drivers/spi/tpm/Makefile.inc<br>+++ b/src/drivers/spi/tpm/Makefile.inc<br>@@ -1,9 +1,9 @@<br>-verstage-$(CONFIG_SPI_TPM) += tis.c tpm.c<br>-romstage-$(CONFIG_SPI_TPM) += tis.c tpm.c<br>-ramstage-$(CONFIG_SPI_TPM) += tis.c tpm.c<br>+verstage-$(CONFIG_SPI_TPM) += tddl.c tpm.c<br>+romstage-$(CONFIG_SPI_TPM) += tddl.c tpm.c<br>+ramstage-$(CONFIG_SPI_TPM) += tddl.c tpm.c<br> <br> ifneq ($(CONFIG_CHROMEOS),y)<br>-bootblock-$(CONFIG_SPI_TPM) += tis.c tpm.c<br>-romstage-$(CONFIG_SPI_TPM) += tis.c tpm.c<br>-ramstage-$(CONFIG_SPI_TPM) += tis.c tpm.c<br>+bootblock-$(CONFIG_SPI_TPM) += tddl.c tpm.c<br>+romstage-$(CONFIG_SPI_TPM) += tddl.c tpm.c<br>+ramstage-$(CONFIG_SPI_TPM) += tddl.c tpm.c<br> endif<br>diff --git a/src/drivers/spi/tpm/tis.c b/src/drivers/spi/tpm/tddl.c<br>similarity index 97%<br>rename from src/drivers/spi/tpm/tis.c<br>rename to src/drivers/spi/tpm/tddl.c<br>index f561a97..58c447d 100644<br>--- a/src/drivers/spi/tpm/tis.c<br>+++ b/src/drivers/spi/tpm/tddl.c<br>@@ -7,7 +7,7 @@<br> #include <arch/early_variables.h><br> #include <console/console.h><br> #include <string.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> <br> #include "tpm.h"<br> <br>diff --git a/src/drivers/spi/tpm/tpm.c b/src/drivers/spi/tpm/tpm.c<br>index 2105e02..baa1b58 100644<br>--- a/src/drivers/spi/tpm/tpm.c<br>+++ b/src/drivers/spi/tpm/tpm.c<br>@@ -23,7 +23,7 @@<br> #include <endian.h><br> #include <string.h><br> #include <timer.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> <br> #include "tpm.h"<br> <br>diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c<br>index 9b63e51..f1a6984 100644<br>--- a/src/mainboard/asus/kgpe-d16/romstage.c<br>+++ b/src/mainboard/asus/kgpe-d16/romstage.c<br>@@ -46,7 +46,7 @@<br> #include <cpu/amd/family_10h-family_15h/init_cpus.h><br> #include <arch/early_variables.h><br> #include <cbmem.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> <br> #include "resourcemap.c"<br> #include "cpu/amd/quadcore/quadcore.c"<br>diff --git a/src/mainboard/google/gru/chromeos.c b/src/mainboard/google/gru/chromeos.c<br>index 92e18bb..ac82205 100644<br>--- a/src/mainboard/google/gru/chromeos.c<br>+++ b/src/mainboard/google/gru/chromeos.c<br>@@ -17,7 +17,7 @@<br> #include <bootmode.h><br> #include <boot/coreboot_tables.h><br> #include <gpio.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> <br> #include "board.h"<br> <br>diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c<br>index e23eced..4c83790 100644<br>--- a/src/mainboard/google/link/romstage.c<br>+++ b/src/mainboard/google/link/romstage.c<br>@@ -35,7 +35,7 @@<br> #include <arch/cpu.h><br> #include <cpu/x86/msr.h><br> #include <halt.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include <cbfs.h><br> <br> #include <southbridge/intel/bd82x6x/chip.h><br>diff --git a/src/mainboard/google/oak/tpm_tis.c b/src/mainboard/google/oak/tpm_tis.c<br>index ba019a6..d5b9f09 100644<br>--- a/src/mainboard/google/oak/tpm_tis.c<br>+++ b/src/mainboard/google/oak/tpm_tis.c<br>@@ -14,7 +14,7 @@<br>  */<br> <br> #include <gpio.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> <br> #include "gpio.h"<br> <br>diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c<br>index f34dac0..d845f4a 100644<br>--- a/src/mainboard/google/parrot/romstage.c<br>+++ b/src/mainboard/google/parrot/romstage.c<br>@@ -35,7 +35,7 @@<br> #include <cpu/x86/msr.h><br> #include <halt.h><br> #include <cbfs.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include "ec/compal/ene932/ec.h"<br> <br> void pch_enable_lpc(void)<br>diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c<br>index 90313fb..8951d06 100644<br>--- a/src/mainboard/google/stout/romstage.c<br>+++ b/src/mainboard/google/stout/romstage.c<br>@@ -35,7 +35,7 @@<br> #include <cpu/x86/msr.h><br> #include <halt.h><br> #include <bootmode.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include <cbfs.h><br> #include <ec/quanta/it8518/ec.h><br> #include "ec.h"<br>diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c<br>index 3827337..5048621 100644<br>--- a/src/mainboard/intel/emeraldlake2/romstage.c<br>+++ b/src/mainboard/intel/emeraldlake2/romstage.c<br>@@ -35,7 +35,7 @@<br> #include <arch/cpu.h><br> #include <cpu/x86/msr.h><br> #include <halt.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> <br> #define SIO_PORT 0x164e<br> <br>diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c<br>index f19f555..efd3d09 100644<br>--- a/src/mainboard/lenovo/x201/romstage.c<br>+++ b/src/mainboard/lenovo/x201/romstage.c<br>@@ -35,7 +35,7 @@<br> #include <timestamp.h><br> #include <arch/acpi.h><br> #include <cbmem.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> <br> #include "dock.h"<br> #include "arch/early_variables.h"<br>diff --git a/src/mainboard/pcengines/apu2/romstage.c b/src/mainboard/pcengines/apu2/romstage.c<br>index 092c626..b068cdf 100644<br>--- a/src/mainboard/pcengines/apu2/romstage.c<br>+++ b/src/mainboard/pcengines/apu2/romstage.c<br>@@ -32,7 +32,7 @@<br> #include <cpu/x86/lapic.h><br> #include <southbridge/amd/pi/hudson/hudson.h><br> #include <Fch/Fch.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> <br> #include "gpio_ftns.h"<br> <br>diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c<br>index a04d538..35ebd56 100644<br>--- a/src/mainboard/samsung/lumpy/romstage.c<br>+++ b/src/mainboard/samsung/lumpy/romstage.c<br>@@ -28,7 +28,7 @@<br> #include <cbmem.h><br> #include <console/console.h><br> #include <bootmode.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include <northbridge/intel/sandybridge/sandybridge.h><br> #include <northbridge/intel/sandybridge/raminit.h><br> #include <northbridge/intel/sandybridge/raminit_native.h><br>diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c<br>index 367a438..d8728d3 100644<br>--- a/src/mainboard/samsung/stumpy/romstage.c<br>+++ b/src/mainboard/samsung/stumpy/romstage.c<br>@@ -37,7 +37,7 @@<br> #include <arch/cpu.h><br> #include <cpu/x86/msr.h><br> #include <halt.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #if IS_ENABLED(CONFIG_DRIVERS_UART_8250IO)<br> #include <superio/smsc/lpc47n207/lpc47n207.h><br> #endif<br>diff --git a/src/northbridge/intel/sandybridge/romstage.c b/src/northbridge/intel/sandybridge/romstage.c<br>index 1f31ad6..6f700db 100644<br>--- a/src/northbridge/intel/sandybridge/romstage.c<br>+++ b/src/northbridge/intel/sandybridge/romstage.c<br>@@ -28,7 +28,7 @@<br> #include <device/pci_def.h><br> #include <device/device.h><br> #include <halt.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include <northbridge/intel/sandybridge/chip.h><br> #include "southbridge/intel/bd82x6x/pch.h"<br> #include <southbridge/intel/common/gpio.h><br>diff --git a/src/security/tpm/Makefile.inc b/src/security/tpm/Makefile.inc<br>index 48e7010..cfd93c3 100644<br>--- a/src/security/tpm/Makefile.inc<br>+++ b/src/security/tpm/Makefile.inc<br>@@ -1,12 +1,12 @@<br>-verstage-$(CONFIG_TPM) += tcg-1.2/tlcl.c<br>-verstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_marshaling.c<br>-verstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_tlcl.c<br>+verstage-$(CONFIG_TPM) += tcg-1.2/tss.c<br>+verstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c<br>+verstage-$(CONFIG_TPM2) += tcg-2.0/tss.c<br> <br> ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y)<br>-romstage-$(CONFIG_TPM) += tcg-1.2/tlcl.c<br>-romstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_marshaling.c<br>-romstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_tlcl.c<br>+romstage-$(CONFIG_TPM) += tcg-1.2/tss.c<br>+romstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c<br>+romstage-$(CONFIG_TPM2) += tcg-2.0/tss.c<br> endif # CONFIG_VBOOT_SEPARATE_VERSTAGE<br> <br>-ramstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_marshaling.c<br>-ramstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_tlcl.c<br>+ramstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c<br>+ramstage-$(CONFIG_TPM2) += tcg-2.0/tss.c<br>diff --git a/src/security/tpm/tcg-1.2/tlcl.c b/src/security/tpm/tcg-1.2/tss.c<br>similarity index 98%<br>rename from src/security/tpm/tcg-1.2/tlcl.c<br>rename to src/security/tpm/tcg-1.2/tss.c<br>index c7fcfcb..f040847 100644<br>--- a/src/security/tpm/tcg-1.2/tlcl.c<br>+++ b/src/security/tpm/tcg-1.2/tss.c<br>@@ -17,11 +17,11 @@<br> #include <arch/early_variables.h><br> #include <assert.h><br> #include <string.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include <vb2_api.h><br>-#include "tlcl_internal.h"<br>-#include "tlcl_structures.h"<br>-#include "../tlcl.h"<br>+#include "tss_internal.h"<br>+#include "tss_structures.h"<br>+#include "../tss.h"<br> <br> #ifdef FOR_TEST<br> #include <stdio.h><br>diff --git a/src/security/tpm/tcg-1.2/tlcl_internal.h b/src/security/tpm/tcg-1.2/tss_internal.h<br>similarity index 93%<br>rename from src/security/tpm/tcg-1.2/tlcl_internal.h<br>rename to src/security/tpm/tcg-1.2/tss_internal.h<br>index 3648be6..01912bb 100644<br>--- a/src/security/tpm/tcg-1.2/tlcl_internal.h<br>+++ b/src/security/tpm/tcg-1.2/tss_internal.h<br>@@ -3,8 +3,8 @@<br>  * found in the LICENSE file.<br>  */<br> <br>-#ifndef TPM_LITE_TLCL_INTERNAL_H_<br>-#define TPM_LITE_TLCL_INTERNAL_H_<br>+#ifndef TCG_TSS_INTERNAL_H_<br>+#define TCG_TSS_INTERNAL_H_<br> <br> /*<br>  * These numbers derive from adding the sizes of command fields as shown in the<br>@@ -62,4 +62,4 @@<br>        *x = (buffer[0] << 8) | buffer[1];<br> }<br> <br>-#endif  /* TPM_LITE_TLCL_INTERNAL_H_ */<br>+#endif  /* TCG_TSS_INTERNAL_H_ */<br>diff --git a/src/security/tpm/tcg-1.2/tlcl_structures.h b/src/security/tpm/tcg-1.2/tss_structures.h<br>similarity index 100%<br>rename from src/security/tpm/tcg-1.2/tlcl_structures.h<br>rename to src/security/tpm/tcg-1.2/tss_structures.h<br>diff --git a/src/security/tpm/tcg-2.0/tpm2_tlcl.c b/src/security/tpm/tcg-2.0/tss.c<br>similarity index 99%<br>rename from src/security/tpm/tcg-2.0/tpm2_tlcl.c<br>rename to src/security/tpm/tcg-2.0/tss.c<br>index e111b89..f95e0a1 100644<br>--- a/src/security/tpm/tcg-2.0/tpm2_tlcl.c<br>+++ b/src/security/tpm/tcg-2.0/tss.c<br>@@ -10,8 +10,8 @@<br> #include <string.h><br> #include <vb2_api.h><br> <br>-#include "tpm2_tlcl_structures.h"<br>-#include "tpm2_marshaling.h"<br>+#include "tss_structures.h"<br>+#include "tss_marshaling.h"<br> #include "../tpm.h"<br> #include "../antirollback.h"<br> <br>diff --git a/src/security/tpm/tcg-2.0/tpm2_marshaling.c b/src/security/tpm/tcg-2.0/tss_marshaling.c<br>similarity index 99%<br>rename from src/security/tpm/tcg-2.0/tpm2_marshaling.c<br>rename to src/security/tpm/tcg-2.0/tss_marshaling.c<br>index 3ce09a4..b1d6663 100644<br>--- a/src/security/tpm/tcg-2.0/tpm2_marshaling.c<br>+++ b/src/security/tpm/tcg-2.0/tss_marshaling.c<br>@@ -10,7 +10,7 @@<br> #include <stdlib.h><br> #include <string.h><br> <br>-#include "tpm2_marshaling.h"<br>+#include "tss_marshaling.h"<br> <br> static uint16_t tpm_tag CAR_GLOBAL;  /* Depends on the command type. */<br> <br>diff --git a/src/security/tpm/tcg-2.0/tpm2_marshaling.h b/src/security/tpm/tcg-2.0/tss_marshaling.h<br>similarity index 89%<br>rename from src/security/tpm/tcg-2.0/tpm2_marshaling.h<br>rename to src/security/tpm/tcg-2.0/tss_marshaling.h<br>index 5802044..d34756d 100644<br>--- a/src/security/tpm/tcg-2.0/tpm2_marshaling.h<br>+++ b/src/security/tpm/tcg-2.0/tss_marshaling.h<br>@@ -3,11 +3,11 @@<br>  * Use of this source code is governed by a BSD-style license that can be<br>  * found in the LICENSE file.<br>  */<br>-#ifndef __SRC_LIB_TPM2_MARSHALING_H<br>-#define __SRC_LIB_TPM2_MARSHALING_H<br>+#ifndef TCG2_TSS_MARSHALING_H_<br>+#define TCG2_TSS_MARSHALING_H_<br> <br> #include <commonlib/iobuf.h><br>-#include "tpm2_tlcl_structures.h"<br>+#include "tss_structures.h"<br> <br> /* The below functions are used to serialize/deserialize TPM2 commands. */<br> <br>@@ -43,4 +43,4 @@<br>  */<br> struct tpm2_response *tpm_unmarshal_response(TPM_CC command, struct ibuf *ib);<br> <br>-#endif // __SRC_LIB_TPM2_MARSHALING_H<br>+#endif // TCG2_TSS_MARSHALING_H_<br>diff --git a/src/security/tpm/tcg-2.0/tpm2_tlcl_structures.h b/src/security/tpm/tcg-2.0/tss_structures.h<br>similarity index 98%<br>rename from src/security/tpm/tcg-2.0/tpm2_tlcl_structures.h<br>rename to src/security/tpm/tcg-2.0/tss_structures.h<br>index acd9e74..389f15d 100644<br>--- a/src/security/tpm/tcg-2.0/tpm2_tlcl_structures.h<br>+++ b/src/security/tpm/tcg-2.0/tss_structures.h<br>@@ -4,8 +4,8 @@<br>  * found in the LICENSE file.<br>  */<br> <br>-#ifndef __SRC_LIB_TPM2_TLCL_STRUCTURES_H<br>-#define __SRC_LIB_TPM2_TLCL_STRUCTURES_H<br>+#ifndef TCG2_TSS_STRUCTURES_H_<br>+#define TCG2_TSS_STRUCTURES_H_<br> <br> /*<br>  * This file includes a subset of definitions of TPM protocol version 2.x<br>@@ -15,7 +15,7 @@<br> #include <compiler.h><br> #include <types.h><br> <br>-#include "../tlcl.h"<br>+#include "../tss.h"<br> <br> /* This should be plenty for what firmware needs. */<br> #define TPM_BUFFER_SIZE 256<br>@@ -370,4 +370,4 @@<br>    TPMI_YES_NO state;<br> };<br> <br>-#endif // __SRC_LIB_TPM2_TLCL_STRUCTURES_H<br>+#endif // TCG2_TSS_STRUCTURES_H_<br>diff --git a/src/security/tpm/tpm.h b/src/security/tpm/tddl.h<br>similarity index 97%<br>rename from src/security/tpm/tpm.h<br>rename to src/security/tpm/tddl.h<br>index 32a44c1..051da0c 100644<br>--- a/src/security/tpm/tpm.h<br>+++ b/src/security/tpm/tddl.h<br>@@ -13,8 +13,8 @@<br>  * GNU General Public License for more details.<br>  */<br> <br>-#ifndef TPM_H_<br>-#define TPM_H_<br>+#ifndef TDDL_H_<br>+#define TDDL_H_<br> <br> #include <stddef.h><br> #include <stdint.h><br>@@ -99,4 +99,4 @@<br>  */<br> int tis_plat_irq_status(void);<br> <br>-#endif /* TPM_H_ */<br>+#endif /* TDDL_H_ */<br>diff --git a/src/security/tpm/tlcl.h b/src/security/tpm/tss.h<br>similarity index 97%<br>rename from src/security/tpm/tlcl.h<br>rename to src/security/tpm/tss.h<br>index 8dd5d80..8f3f1cb 100644<br>--- a/src/security/tpm/tlcl.h<br>+++ b/src/security/tpm/tss.h<br>@@ -9,8 +9,8 @@<br>  * A low-level library for interfacing to TPM hardware or an emulator.<br>  */<br> <br>-#ifndef TPM_LITE_TLCL_H_<br>-#define TPM_LITE_TLCL_H_<br>+#ifndef TSS_H_<br>+#define TSS_H_<br> #include <stdint.h><br> #include <types.h><br> <br>@@ -174,4 +174,4 @@<br> uint32_t tlcl_cr50_enable_update(uint16_t timeout_ms,<br>                                  uint8_t *num_restored_headers);<br> <br>-#endif  /* TPM_LITE_TLCL_H_ */<br>+#endif  /* TSS_H_ */<br>diff --git a/src/security/tpm/tpm_error_messages.h b/src/security/tpm/tss_error_messages.h<br>similarity index 99%<br>rename from src/security/tpm/tpm_error_messages.h<br>rename to src/security/tpm/tss_error_messages.h<br>index ac7cd4e..d597860 100644<br>--- a/src/security/tpm/tpm_error_messages.h<br>+++ b/src/security/tpm/tss_error_messages.h<br>@@ -9,8 +9,8 @@<br>  * Version 1.2 Level 2 Revision 103 26 October 2006 Draft.<br>  */<br> <br>-#ifndef TPM_ERROR_MESSAGES_H<br>-#define TPM_ERROR_MESSAGES_H<br>+#ifndef TSS_ERROR_MESSAGES_H_<br>+#define TSS_ERROR_MESSAGES_H_<br> <br> #define TPM_E_BASE 0x0<br> #define TPM_E_NON_FATAL 0x800<br>@@ -252,4 +252,4 @@<br> time-out period"},<br> };<br> <br>-#endif                             /* TPM_ERROR_MESSAGES_H */<br>+#endif                             /* TSS_ERROR_MESSAGES_H_ */<br>diff --git a/src/security/vboot/secdata_mock.c b/src/security/vboot/secdata_mock.c<br>index ff8e98e..4ea5355 100644<br>--- a/src/security/vboot/secdata_mock.c<br>+++ b/src/security/vboot/secdata_mock.c<br>@@ -34,7 +34,7 @@<br> <br> #include <security/tpm/antirollback.h><br> #include <stdlib.h><br>-#include <security/tpm/tlcl.h><br>+#include <security/tpm/tss.h><br> #include <vb2_api.h><br> <br> uint32_t tpm_extend_pcr(struct vb2_context *ctx, int pcr,<br>diff --git a/src/security/vboot/secdata_tpm.c b/src/security/vboot/secdata_tpm.c<br>index 2dc11bd..04162b0 100644<br>--- a/src/security/vboot/secdata_tpm.c<br>+++ b/src/security/vboot/secdata_tpm.c<br>@@ -35,7 +35,7 @@<br> #include <security/tpm/antirollback.h><br> #include <stdlib.h><br> #include <string.h><br>-#include <security/tpm/tlcl.h><br>+#include <security/tpm/tss.h><br> #include <vb2_api.h><br> #include <console/console.h><br> <br>diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c<br>index d8e6449..dece7cb 100644<br>--- a/src/soc/intel/baytrail/romstage/romstage.c<br>+++ b/src/soc/intel/baytrail/romstage/romstage.c<br>@@ -30,7 +30,7 @@<br> #include <stage_cache.h><br> #include <string.h><br> #include <timestamp.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include <vendorcode/google/chromeos/chromeos.h><br> #include <soc/gpio.h><br> #include <soc/iomap.h><br>diff --git a/src/soc/intel/braswell/romstage/romstage.c b/src/soc/intel/braswell/romstage/romstage.c<br>index ec0ca54..5eeb1b2 100644<br>--- a/src/soc/intel/braswell/romstage/romstage.c<br>+++ b/src/soc/intel/braswell/romstage/romstage.c<br>@@ -43,7 +43,7 @@<br> #include <soc/romstage.h><br> #include <soc/smm.h><br> #include <soc/spi.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> <br> void program_base_addresses(void)<br> {<br>diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage/romstage.c<br>index fa4c1ea..ac6f76a 100644<br>--- a/src/soc/intel/broadwell/romstage/romstage.c<br>+++ b/src/soc/intel/broadwell/romstage/romstage.c<br>@@ -25,7 +25,7 @@<br> #include <cbmem.h><br> #include <cpu/x86/mtrr.h><br> #include <elog.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> #include <program_loading.h><br> #include <romstage_handoff.h><br> #include <stage_cache.h><br>diff --git a/src/soc/intel/common/tpm_tis.c b/src/soc/intel/common/tpm_tis.c<br>index f088c0d..613bec1 100644<br>--- a/src/soc/intel/common/tpm_tis.c<br>+++ b/src/soc/intel/common/tpm_tis.c<br>@@ -14,7 +14,7 @@<br>  */<br> <br> #include <arch/acpi.h><br>-#include <security/tpm/tpm.h><br>+#include <security/tpm/tddl.h><br> <br> int tis_plat_irq_status(void)<br> {<br>diff --git a/src/vendorcode/google/chromeos/cr50_enable_update.c b/src/vendorcode/google/chromeos/cr50_enable_update.c<br>index 450d71f..931e14a 100644<br>--- a/src/vendorcode/google/chromeos/cr50_enable_update.c<br>+++ b/src/vendorcode/google/chromeos/cr50_enable_update.c<br>@@ -18,7 +18,7 @@<br> #include <ec/google/chromeec/ec.h><br> #include <elog.h><br> #include <halt.h><br>-#include <security/tpm/tlcl.h><br>+#include <security/tpm/tss.h><br> #include <vb2_api.h><br> #include <security/vboot/vboot_common.h><br> <br>diff --git a/src/vendorcode/google/chromeos/tpm2.c b/src/vendorcode/google/chromeos/tpm2.c<br>index 266cf75..d4816e0 100644<br>--- a/src/vendorcode/google/chromeos/tpm2.c<br>+++ b/src/vendorcode/google/chromeos/tpm2.c<br>@@ -15,7 +15,7 @@<br> <br> #include <bootstate.h><br> #include <console/console.h><br>-#include <security/tpm/tlcl.h><br>+#include <security/tpm/tss.h><br> #include <vb2_api.h><br> <br> static void disable_platform_hierarchy(void *unused)<br></pre><p>To view, visit <a href="https://review.coreboot.org/22104">change 22104</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/22104"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I206dd6a32dbd303a6d4d987e424407ebf5c518fa </div>
<div style="display:none"> Gerrit-Change-Number: 22104 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki@gmail.com> </div>