summaryrefslogtreecommitdiffstats
path: root/drivers/tpm/Makefile
diff options
context:
space:
mode:
authorTom Wai-Hong Tam <waihong@chromium.org>2013-04-12 11:04:37 +0000
committerSimon Glass <sjg@chromium.org>2013-06-03 01:31:23 -0700
commit1b393db5870927d68c42a46e6c5877c8d0d83910 (patch)
tree9c8357f65d5221778bcd7a9272c40823eeb89649 /drivers/tpm/Makefile
parentec34fa5e43bfbef5a93394db04ff3b03fdfe3f44 (diff)
downloadtalos-obmc-uboot-1b393db5870927d68c42a46e6c5877c8d0d83910.tar.gz
talos-obmc-uboot-1b393db5870927d68c42a46e6c5877c8d0d83910.zip
tpm: Reorganize the I2C TPM driver
This patch does a similar code reogranzation from http://patchwork.ozlabs.org/patch/132179/ which is based on an old version of code (fdt support and bus selection still not in). It merges this tidy-up on top of the recent code. It does not make any logical change. tpm.c implements the interface defined in tpm.h based on underlying LPC or I2C TPM driver. tpm.c and the underlying driver communicate throught tpm_private.h. Note: Merging the LPC driver with tpm.c is left to future patches. Change-Id: Ie1384f5f9e3935d3bc9a44adf8de80c5a70a5f2b Signed-off-by: Tom Wai-Hong Tam <waihong@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/tpm/Makefile')
-rw-r--r--drivers/tpm/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile
index d1f9bbf241..913dd9c862 100644
--- a/drivers/tpm/Makefile
+++ b/drivers/tpm/Makefile
@@ -25,9 +25,10 @@ LIB := $(obj)libtpm.o
$(shell mkdir -p $(obj)slb9635_i2c)
-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
+# TODO: Merge tpm_tis_lpc.c with tpm.c
+COBJS-$(CONFIG_TPM_TIS_I2C) += tpm.o
+COBJS-$(CONFIG_TPM_TIS_I2C) += tpm_tis_i2c.o
+COBJS-$(CONFIG_TPM_TIS_LPC) += tpm_tis_lpc.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
OpenPOWER on IntegriCloud