diff options
| author | Tom Rini <trini@ti.com> | 2013-06-05 08:55:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-05 08:55:35 -0400 |
| commit | 1318d00e5894ac55bc6b7297f3eda97983b79fae (patch) | |
| tree | 61af0fa9a78277998455eac609bb72d4a2058ea2 /drivers/tpm/Makefile | |
| parent | 99bd544ee76af3302b8421eaaddfe61f56915fc6 (diff) | |
| parent | 1b393db5870927d68c42a46e6c5877c8d0d83910 (diff) | |
Merge branch 'tpm' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/tpm/Makefile')
| -rw-r--r-- | drivers/tpm/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile index e8c159c0f3..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_GENERIC_LPC_TPM) = generic_lpc_tpm.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) |