From 90899cc0144f4dea0fa402af1bf8be37c215e785 Mon Sep 17 00:00:00 2001 From: Che-liang Chiou Date: Fri, 12 Apr 2013 11:04:34 +0000 Subject: [PATCH] tpm: Rename generic_lpc_tpm to tpm_tis_lpc The new name is more aligned with Linux kernel's naming of TPM driver. Signed-off-by: Peter Huewe Signed-off-by: Che-Liang Chiou Signed-off-by: Simon Glass Acked-by: Mike Frysinger Reviewed-by: Simon Glass Tested-by: Tom Wai-Hong Tam --- README | 5 ++++- drivers/tpm/Makefile | 2 +- drivers/tpm/{generic_lpc_tpm.c => tpm_tis_lpc.c} | 0 3 files changed, 5 insertions(+), 2 deletions(-) rename drivers/tpm/{generic_lpc_tpm.c => tpm_tis_lpc.c} (100%) diff --git a/README b/README index b1b3e1788e..b025dfc24a 100644 --- a/README +++ b/README @@ -1209,7 +1209,10 @@ The following options need to be configured: If this option is set, the driver enables cache flush. - TPM Support: - CONFIG_GENERIC_LPC_TPM + CONFIG_TPM + Support TPM devices. + + CONFIG_TPM_TIS_LPC Support for generic parallel port TPM devices. Only one device per system is supported at this time. diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile index e8c159c0f3..d1f9bbf241 100644 --- a/drivers/tpm/Makefile +++ b/drivers/tpm/Makefile @@ -25,7 +25,7 @@ LIB := $(obj)libtpm.o $(shell mkdir -p $(obj)slb9635_i2c) -COBJS-$(CONFIG_GENERIC_LPC_TPM) = generic_lpc_tpm.o +COBJS-$(CONFIG_TPM_TIS_LPC) = tpm_tis_lpc.o COBJS-$(CONFIG_INFINEON_TPM_I2C) += tis_i2c.o slb9635_i2c/tpm.o COBJS-$(CONFIG_INFINEON_TPM_I2C) += slb9635_i2c/tpm_tis_i2c.o diff --git a/drivers/tpm/generic_lpc_tpm.c b/drivers/tpm/tpm_tis_lpc.c similarity index 100% rename from drivers/tpm/generic_lpc_tpm.c rename to drivers/tpm/tpm_tis_lpc.c -- 2.39.5