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>
master
Simon Glass 9 years ago
parent 3e7d940bb6
commit 2419cd16a1
  1. 15
      drivers/tpm/Kconfig
  2. 2
      drivers/tpm/Makefile
  3. 1
      lib/Kconfig

@ -4,15 +4,6 @@
menu "TPM support" 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 config TPM_TIS_SANDBOX
bool "Enable sandbox TPM driver" bool "Enable sandbox TPM driver"
depends on SANDBOX depends on SANDBOX
@ -24,7 +15,7 @@ config TPM_TIS_SANDBOX
config TPM_ATMEL_TWI config TPM_ATMEL_TWI
bool "Enable Atmel TWI TPM device driver" bool "Enable Atmel TWI TPM device driver"
depends on DM_TPM && DM_I2C depends on TPM && DM_I2C
help help
This driver supports an Atmel TPM device connected on the I2C bus. 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 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 config TPM_TIS_INFINEON
bool "Enable support for Infineon SLB9635/45 TPMs on I2C" bool "Enable support for Infineon SLB9635/45 TPMs on I2C"
depends on DM_TPM && DM_I2C depends on TPM && DM_I2C
help help
This driver supports Infineon TPM devices connected on the I2C bus. This driver supports Infineon TPM devices connected on the I2C bus.
The usual tpm operations and the 'tpm' command can be used to talk 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 config TPM_TIS_LPC
bool "Enable support for Infineon SLB9635/45 TPMs on LPC" bool "Enable support for Infineon SLB9635/45 TPMs on LPC"
depends on DM_TPM && X86 depends on TPM && X86
help help
This driver supports Infineon TPM devices connected on the I2C bus. This driver supports Infineon TPM devices connected on the I2C bus.
The usual tpm operations and the 'tpm' command can be used to talk The usual tpm operations and the 'tpm' command can be used to talk

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0+ # 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_ATMEL_TWI) += tpm_atmel_twi.o
obj-$(CONFIG_TPM_TIS_INFINEON) += tpm_tis_infineon.o obj-$(CONFIG_TPM_TIS_INFINEON) += tpm_tis_infineon.o

@ -56,6 +56,7 @@ source lib/rsa/Kconfig
config TPM config TPM
bool "Trusted Platform Module (TPM) Support" bool "Trusted Platform Module (TPM) Support"
depends on DM
help help
This enables support for TPMs which can be used to provide security This enables support for TPMs which can be used to provide security
features for your board. The TPM can be connected via LPC or I2C features for your board. The TPM can be connected via LPC or I2C

Loading…
Cancel
Save