From 0ca944b16fd6c0d25bee666206ada43f95024ce3 Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Wed, 20 Nov 2019 19:51:06 +0100
Subject: 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>
---
 src/drivers/crb/tis.c | 9 ++++-----
 src/drivers/crb/tpm.c | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/drivers/crb')

diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c
index b7a5df4829..f2aba48297 100644
--- a/src/drivers/crb/tis.c
+++ b/src/drivers/crb/tis.c
@@ -11,7 +11,6 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/early_variables.h>
 #include <console/console.h>
 #include <security/tpm/tis.h>
 #include <arch/acpigen.h>
@@ -21,7 +20,7 @@
 #include "tpm.h"
 #include "chip.h"
 
-static unsigned tpm_is_open CAR_GLOBAL;
+static unsigned int tpm_is_open;
 
 static const struct {
 	uint16_t vid;
@@ -45,7 +44,7 @@ static const char *tis_get_dev_name(struct tpm2_info *info)
 
 int tis_open(void)
 {
-	if (car_get_var(tpm_is_open)) {
+	if (tpm_is_open) {
 		printk(BIOS_ERR, "%s called twice.\n", __func__);
 		return -1;
 	}
@@ -63,13 +62,13 @@ int tis_open(void)
 
 int tis_close(void)
 {
-	if (car_get_var(tpm_is_open)) {
+	if (tpm_is_open) {
 
 		/*
 		 * Do we need to do something here, like waiting for a
 		 * transaction to stop?
 		 */
-		car_set_var(tpm_is_open, 0);
+		tpm_is_open = 0;
 	}
 
 	return 0;
diff --git a/src/drivers/crb/tpm.c b/src/drivers/crb/tpm.c
index 0393417e74..f2b7903e4c 100644
--- a/src/drivers/crb/tpm.c
+++ b/src/drivers/crb/tpm.c
@@ -15,7 +15,6 @@
  */
 
 #include <timer.h>
-#include <arch/early_variables.h>
 #include <console/console.h>
 #include <arch/mmio.h>
 #include <delay.h>
-- 
cgit v1.2.3