tpm: allow TPM v1 and v2 to be compiled at the same time

[platform/kernel/u-boot.git] / drivers / tpm / tpm2_tis_sandbox.c

diff --git a/drivers/tpm/tpm2_tis_sandbox.c b/drivers/tpm/tpm2_tis_sandbox.c
index 3240cc5..66f6c9b 100644 (file)
--- a/drivers/tpm/tpm2_tis_sandbox.c
+++ b/drivers/tpm/tpm2_tis_sandbox.c
@@ -232,7 +232,7 @@ static int sandbox_tpm2_fill_buf(u8 **recv, size_t *recv_len, u16 tag, u32 rc)
        *recv += sizeof(rc);
 
        /* Add trailing \0 */
-       *recv = '\0';
+       *recv = NULL;
 
        return 0;
 }
@@ -590,6 +590,9 @@ static int sandbox_tpm2_probe(struct udevice *dev)
        struct sandbox_tpm2 *tpm = dev_get_priv(dev);
        struct tpm_chip_priv *priv = dev_get_uclass_priv(dev);
 
+       /* Use the TPM v2 stack */
+       priv->version = TPM_V2;
+
        memset(tpm, 0, sizeof(*tpm));
 
        priv->pcr_count = 32;