From 95b3f286a83b5433ec08499cc4a4d83943c546c1 Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Wed, 20 Nov 2019 21:23:16 +0100
Subject: [PATCH] ec/google/chromeec: Drop CAR_GLOBAL_MIGRATION support

Change-Id: I09bca1897920871a6b29c25dc2bad94a8061da29
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37038
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/ec/google/chromeec/ec.c     | 3 +--
 src/ec/google/chromeec/ec_spi.c | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index a9921467f4..5dff16252b 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <cbmem.h>
 #include <console/console.h>
-#include <arch/early_variables.h>
 #include <assert.h>
 #include <bootmode.h>
 #include <bootstate.h>
@@ -231,7 +230,7 @@ bool google_chromeec_is_uhepi_supported(void)
 #define UHEPI_SUPPORTED 1
 #define UHEPI_NOT_SUPPORTED 2
 
-	static int uhepi_support CAR_GLOBAL;
+	static int uhepi_support;
 
 	if (!uhepi_support) {
 		uhepi_support = google_chromeec_check_feature
diff --git a/src/ec/google/chromeec/ec_spi.c b/src/ec/google/chromeec/ec_spi.c
index c47d419647..84a605bf9c 100644
--- a/src/ec/google/chromeec/ec_spi.c
+++ b/src/ec/google/chromeec/ec_spi.c
@@ -20,8 +20,6 @@
 #include <spi-generic.h>
 #include <timer.h>
 
-/* This is assuming that this driver is not used on x86. If that changes, this
-   might need to become a CAR_GLOBAL or maybe even more complicated. */
 static struct stopwatch cs_cooldown_sw;
 static const long cs_cooldown_us = 200;