[PATCH v3 01/11] tpm: Don't include cr50 in TPL/SPL

[Ilias Apalodimas]

On Sat, Jan 23, 2021 at 10:25:57AM -0700, Simon Glass wrote:
> At present the security chip is not used in these U-Boot phases. Update
> the Makefile to exclude it.
> 
> Fix a few logging statements while we are here.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
> (no changes since v1)
> 
>  drivers/tpm/Makefile   | 2 +-
>  drivers/tpm/cr50_i2c.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile
> index 8f075b9f45f..f64d20067f8 100644
> --- a/drivers/tpm/Makefile
> +++ b/drivers/tpm/Makefile
> @@ -10,7 +10,7 @@ obj-$(CONFIG_TPM_TIS_SANDBOX) += tpm_tis_sandbox.o
>  obj-$(CONFIG_TPM_ST33ZP24_I2C) += tpm_tis_st33zp24_i2c.o
>  obj-$(CONFIG_TPM_ST33ZP24_SPI) += tpm_tis_st33zp24_spi.o
>  
> -obj-$(CONFIG_TPM2_CR50_I2C) += cr50_i2c.o
> +obj-$(CONFIG_$(SPL_TPL_)TPM2_CR50_I2C) += cr50_i2c.o
>  obj-$(CONFIG_TPM2_TIS_SANDBOX) += tpm2_tis_sandbox.o
>  obj-$(CONFIG_TPM2_TIS_SPI) += tpm2_tis_spi.o
>  obj-$(CONFIG_TPM2_FTPM_TEE) += tpm2_ftpm_tee.o
> diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c
> index b103a6fdc39..76432bdec1f 100644
> --- a/drivers/tpm/cr50_i2c.c
> +++ b/drivers/tpm/cr50_i2c.c
> @@ -309,7 +309,7 @@ static int cr50_i2c_recv(struct udevice *dev, u8 *buf, size_t buf_len)
>  	int status;
>  	int ret;
>  
> -	log_debug("%s: len=%x\n", __func__, buf_len);
> +	log_debug("%s: buf_len=%x\n", __func__, buf_len);
>  	if (buf_len < TPM_HEADER_SIZE)
>  		return -E2BIG;
>  
> @@ -386,7 +386,7 @@ static int cr50_i2c_send(struct udevice *dev, const u8 *buf, size_t len)
>  	ulong timeout;
>  	int ret;
>  
> -	log_debug("%s: len=%x\n", __func__, len);
> +	log_debug("len=%x\n", len);
>  	timeout = timer_get_us() + TIMEOUT_LONG_US;
>  	do {
>  		ret = cr50_i2c_status(dev);
> -- 
> 2.30.0.280.ga3ce27912f-goog
> 
Reviewed-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>