efi_loader: selftest: enable APPEND_WRITE tests

[oweals/u-boot.git] / lib / tpm-v1.c

diff --git a/lib/tpm-v1.c b/lib/tpm-v1.c
index f29e62ff7b2928e30787f436313de40b53a964fd..b4498e6afc7ee6e38dd08617e6652e72f0c0e2b5 100644 (file)
--- a/lib/tpm-v1.c
+++ b/lib/tpm-v1.c
@@ -79,19 +79,19 @@ u32 tpm_clear_and_reenable(struct udevice *dev)
                return ret;
        }
 
-#if IS_ENABLED(CONFIG_TPM_V1)
-       ret = tpm_physical_enable(dev);
-       if (ret != TPM_SUCCESS) {
-               log_err("TPM: Can't set enabled state\n");
-               return ret;
-       }
+       if (tpm_get_version(dev) == TPM_V1) {
+               ret = tpm_physical_enable(dev);
+               if (ret != TPM_SUCCESS) {
+                       log_err("TPM: Can't set enabled state\n");
+                       return ret;
+               }
 
-       ret = tpm_physical_set_deactivated(dev, 0);
-       if (ret != TPM_SUCCESS) {
-               log_err("TPM: Can't set deactivated state\n");
-               return ret;
+               ret = tpm_physical_set_deactivated(dev, 0);
+               if (ret != TPM_SUCCESS) {
+                       log_err("TPM: Can't set deactivated state\n");
+                       return ret;
+               }
        }
-#endif
 
        return TPM_SUCCESS;
 }
@@ -211,9 +211,7 @@ u32 tpm_nv_write_value(struct udevice *dev, u32 index, const void *data,
 
 uint32_t tpm_set_global_lock(struct udevice *dev)
 {
-       u32 x;
-
-       return tpm_nv_write_value(dev, TPM_NV_INDEX_0, (uint8_t *)&x, 0);
+       return tpm_nv_write_value(dev, TPM_NV_INDEX_0, NULL, 0);
 }
 
 u32 tpm_extend(struct udevice *dev, u32 index, const void *in_digest,