diff options
| author | Simon Glass <sjg@chromium.org> | 2015-10-03 06:39:36 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-10-23 09:42:28 -0600 |
| commit | 2419cd16a1357a6d0f394b4631ea07b4f9e85ac7 (patch) | |
| tree | 8eb00068e28c728550a430003b1e8ced127bac7f /drivers/tpm | |
| parent | 3e7d940bb695fd8ba450dde7742a58a224efaee4 (diff) | |
| download | blackbird-obmc-uboot-2419cd16a1357a6d0f394b4631ea07b4f9e85ac7.tar.gz blackbird-obmc-uboot-2419cd16a1357a6d0f394b4631ea07b4f9e85ac7.zip | |
dm: tpm: Drop CONFIG_DM_TPM
Now that all TPM drivers use driver model, we can drop the special driver
model CONFIG option.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Christophe Ricard<christophe-h.ricard@st.com>
Diffstat (limited to 'drivers/tpm')
| -rw-r--r-- | drivers/tpm/Kconfig | 15 | ||||
| -rw-r--r-- | drivers/tpm/Makefile | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/drivers/tpm/Kconfig b/drivers/tpm/Kconfig index 3ab652cbcd..31b35f75c9 100644 --- a/drivers/tpm/Kconfig +++ b/drivers/tpm/Kconfig @@ -4,15 +4,6 @@ menu "TPM support" -config DM_TPM - bool "Enable driver model for Trusted Platform Module drivers" - depends on DM && TPM - help - Enable driver model for TPMs. The TIS interface (tis_open(), - tis_sendrecv(), etc.) is then implemented by the TPM uclass. Note - that even with driver model only a single TPM is currently - supported, since the tpm library assumes this. - config TPM_TIS_SANDBOX bool "Enable sandbox TPM driver" depends on SANDBOX @@ -24,7 +15,7 @@ config TPM_TIS_SANDBOX config TPM_ATMEL_TWI bool "Enable Atmel TWI TPM device driver" - depends on DM_TPM && DM_I2C + depends on TPM && DM_I2C help This driver supports an Atmel TPM device connected on the I2C bus. The usual tpm operations and the 'tpm' command can be used to talk @@ -33,7 +24,7 @@ config TPM_ATMEL_TWI config TPM_TIS_INFINEON bool "Enable support for Infineon SLB9635/45 TPMs on I2C" - depends on DM_TPM && DM_I2C + depends on TPM && DM_I2C help This driver supports Infineon TPM devices connected on the I2C bus. The usual tpm operations and the 'tpm' command can be used to talk @@ -57,7 +48,7 @@ config TPM_TIS_I2C_BURST_LIMITATION_LEN config TPM_TIS_LPC bool "Enable support for Infineon SLB9635/45 TPMs on LPC" - depends on DM_TPM && X86 + depends on TPM && X86 help This driver supports Infineon TPM devices connected on the I2C bus. The usual tpm operations and the 'tpm' command can be used to talk diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile index 5748145ad5..1d49e952ae 100644 --- a/drivers/tpm/Makefile +++ b/drivers/tpm/Makefile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_DM_TPM) += tpm-uclass.o +obj-$(CONFIG_TPM) += tpm-uclass.o obj-$(CONFIG_TPM_ATMEL_TWI) += tpm_atmel_twi.o obj-$(CONFIG_TPM_TIS_INFINEON) += tpm_tis_infineon.o |
