diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2019-11-20 19:51:06 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-11-29 09:08:33 +0000 |
| commit | 0ca944b16fd6c0d25bee666206ada43f95024ce3 (patch) | |
| tree | a3e0d51cf395f015809d2bda99ec69fe37c6a817 /src/drivers/pc80 | |
| parent | 344e86bb3baff8f89c1335c190dbee050176e058 (diff) | |
| download | coreboot-0ca944b16fd6c0d25bee666206ada43f95024ce3.tar.xz | |
security/tpm: Drop CAR_GLOBAL_MIGRATION support
Change-Id: I1c09eda6164efb390de4626f52aafba59962f9c4
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37029
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/drivers/pc80')
| -rw-r--r-- | src/drivers/pc80/tpm/tis.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c index 1baab26b00..39fa70db3f 100644 --- a/src/drivers/pc80/tpm/tis.c +++ b/src/drivers/pc80/tpm/tis.c @@ -31,7 +31,6 @@ #include <device/device.h> #include <console/console.h> #include <security/tpm/tis.h> -#include <arch/early_variables.h> #include <device/pnp.h> #include "chip.h" @@ -162,7 +161,7 @@ static const struct vendor_name vendor_names[] = { * Cached vendor/device ID pair to indicate that the device has been already * discovered */ -static u32 vendor_dev_id CAR_GLOBAL; +static u32 vendor_dev_id; static inline u8 tpm_read_status(int locality) { @@ -402,7 +401,7 @@ static u32 tis_probe(void) u16 vid, did; int i; - if (car_get_var(vendor_dev_id)) + if (vendor_dev_id) return 0; /* Already probed. */ didvid = tpm_read_did_vid(0); @@ -411,7 +410,7 @@ static u32 tis_probe(void) return TPM_DRIVER_ERR; } - car_set_var(vendor_dev_id, didvid); + vendor_dev_id = didvid; vid = didvid & 0xffff; did = (didvid >> 16) & 0xffff; |