summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChe-liang Chiou <clchiou@chromium.org>2013-04-12 11:04:34 +0000
committerSimon Glass <sjg@chromium.org>2013-06-03 01:26:25 -0700
commit90899cc0144f4dea0fa402af1bf8be37c215e785 (patch)
treefcc8832714e868d65cff8111e03d636b9293dc5a
parentd6639d10dbfa42dc888f8917012550b632a88959 (diff)
downloadu-boot-imx-90899cc0144f4dea0fa402af1bf8be37c215e785.zip
u-boot-imx-90899cc0144f4dea0fa402af1bf8be37c215e785.tar.gz
u-boot-imx-90899cc0144f4dea0fa402af1bf8be37c215e785.tar.bz2
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 <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>
-rw-r--r--README5
-rw-r--r--drivers/tpm/Makefile2
-rw-r--r--drivers/tpm/tpm_tis_lpc.c (renamed from drivers/tpm/generic_lpc_tpm.c)0
3 files changed, 5 insertions, 2 deletions
diff --git a/README b/README
index b1b3e17..b025dfc 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
diff --git a/drivers/tpm/generic_lpc_tpm.c b/drivers/tpm/tpm_tis_lpc.c
index 04ad418..04ad418 100644
--- a/drivers/tpm/generic_lpc_tpm.c
+++ b/drivers/tpm/tpm_tis_lpc.c