]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
tpm: Rename generic_lpc_tpm to tpm_tis_lpc
authorChe-liang Chiou <clchiou@chromium.org>
Fri, 12 Apr 2013 11:04:34 +0000 (11:04 +0000)
committerSimon Glass <sjg@chromium.org>
Mon, 3 Jun 2013 08:26:25 +0000 (01:26 -0700)
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
drivers/tpm/Makefile
drivers/tpm/tpm_tis_lpc.c [moved from drivers/tpm/generic_lpc_tpm.c with 100% similarity]

diff --git a/README b/README
index b1b3e1788ec92d8ba088dab91175dfb1a44e2e26..b025dfc24aec94f06b9f235bfe582c4e0897c3af 100644 (file)
--- 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.
 
index e8c159c0f3fee868c68c42a34e35799e87ce7c25..d1f9bbf24114f67c0755ebe071262e04c520646c 100644 (file)
@@ -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