Patchwork [U-Boot,1/5] tpm: Rename generic_lpc_tpm to tpm_tis_lpc

login
register
mail settings
Submitter Simon Glass
Date April 12, 2013, 9:04 p.m.
Message ID <1365800678-5251-1-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/236211/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Simon Glass - April 12, 2013, 9:04 p.m.
From: Che-liang Chiou <clchiou@chromium.org>

The new name is more aligned with Linux kernel's naming of TPM driver.

Signed-off-by: Peter Huewe <peter.huewe@infineon.com>
Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
---
 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/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

Patch

diff --git a/README b/README
index 67a071f..abc8b55 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 e8c159c..d1f9bbf 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