| Message ID | 1443875976-1018-1-git-send-email-sjg@chromium.org |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
Hi Simon, Acked-by: Christophe Ricard<christophe-h.ricard@st.com> Best Regards Christophe On 03/10/2015 14:39, Simon Glass wrote: > 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> > --- > > Changes in v2: > - Fix missing 'depends on DM' left out of the v1 patch > > drivers/tpm/Kconfig | 15 +++------------ > drivers/tpm/Makefile | 2 +- > lib/Kconfig | 1 + > 3 files changed, 5 insertions(+), 13 deletions(-) > > diff --git a/drivers/tpm/Kconfig b/drivers/tpm/Kconfig > index 3ab652c..31b35f7 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 5748145..1d49e95 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 > diff --git a/lib/Kconfig b/lib/Kconfig > index 0673072..70ed20d 100644 > --- a/lib/Kconfig > +++ b/lib/Kconfig > @@ -56,6 +56,7 @@ source lib/rsa/Kconfig > > config TPM > bool "Trusted Platform Module (TPM) Support" > + depends on DM > help > 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
On 4 October 2015 at 02:46, Christophe Ricard <christophe.ricard@gmail.com> wrote: > Hi Simon, > > Acked-by: Christophe Ricard<christophe-h.ricard@st.com> > > Best Regards > Christophe > Applied to u-boot-dm
diff --git a/drivers/tpm/Kconfig b/drivers/tpm/Kconfig index 3ab652c..31b35f7 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 5748145..1d49e95 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 diff --git a/lib/Kconfig b/lib/Kconfig index 0673072..70ed20d 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -56,6 +56,7 @@ source lib/rsa/Kconfig config TPM bool "Trusted Platform Module (TPM) Support" + depends on DM help 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
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> --- Changes in v2: - Fix missing 'depends on DM' left out of the v1 patch drivers/tpm/Kconfig | 15 +++------------ drivers/tpm/Makefile | 2 +- lib/Kconfig | 1 + 3 files changed, 5 insertions(+), 13 deletions(-)