tpm: Don't include cr50 in TPL/SPL

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@chromium.org>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

diff --git a/drivers/tpm/Makefile b/drivers/tpm/Makefile
index 8f075b9f45fbe467daf5634638224ae6c15b8e47..f64d20067f884729aa14bb07078d8de3fed8781b 100644 (file)
--- 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 b103a6fdc39c44ce57a18d7f7c9e8b0578148489..76432bdec1f86b205c4c4bde68e19d91cfd08a86 100644 (file)
--- 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);