From 7e8bad4daad8c92911833c06b6492bacfe8efdff Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Sat, 29 Dec 2018 14:20:23 +0100
Subject: soc/intel/cannonlake: Don't use CAR_GLOBAL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

All platforms using this code have NO_CAR_GLOBAL_MIGRATION.

Change-Id: I72effa93e36156ad35b3e45db449d8d0d0cabf06
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/30514
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
 src/mainboard/google/sarien/chromeos.c          | 7 +++----
 src/soc/intel/cannonlake/romstage/power_state.c | 1 -
 src/soc/intel/cannonlake/romstage/romstage.c    | 1 -
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/mainboard/google/sarien/chromeos.c b/src/mainboard/google/sarien/chromeos.c
index f9e42e0f69..4cd6e16a95 100644
--- a/src/mainboard/google/sarien/chromeos.c
+++ b/src/mainboard/google/sarien/chromeos.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/acpi.h>
-#include <arch/early_variables.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
 #include <soc/gpio.h>
@@ -31,7 +30,7 @@ enum rec_mode_state {
 	REC_MODE_NOT_REQUESTED,
 	REC_MODE_REQUESTED,
 };
-static enum rec_mode_state saved_rec_mode CAR_GLOBAL;
+static enum rec_mode_state saved_rec_mode;
 
 void fill_lb_gpios(struct lb_gpios *gpios)
 {
@@ -85,7 +84,7 @@ int get_write_protect_state(void)
 
 int get_recovery_mode_switch(void)
 {
-	enum rec_mode_state state = car_get_var(saved_rec_mode);
+	enum rec_mode_state state = saved_rec_mode;
 	uint8_t recovery_button_state = 0;
 
 	/* Check the global variable first. */
@@ -106,7 +105,7 @@ int get_recovery_mode_switch(void)
 			REC_MODE_REQUESTED : REC_MODE_NOT_REQUESTED;
 
 	/* Store the state in case this is called again in verstage. */
-	car_set_var(saved_rec_mode, state);
+	saved_rec_mode = state;
 
 	return state == REC_MODE_REQUESTED;
 }
diff --git a/src/soc/intel/cannonlake/romstage/power_state.c b/src/soc/intel/cannonlake/romstage/power_state.c
index 99a93accbe..4214fcc06c 100644
--- a/src/soc/intel/cannonlake/romstage/power_state.c
+++ b/src/soc/intel/cannonlake/romstage/power_state.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/early_variables.h>
 #include <arch/io.h>
 #include <console/console.h>
 #include <device/device.h>
diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c
index 9224ba6dea..9e25e551e8 100644
--- a/src/soc/intel/cannonlake/romstage/romstage.c
+++ b/src/soc/intel/cannonlake/romstage/romstage.c
@@ -14,7 +14,6 @@
  */
 
 #include <arch/io.h>
-#include <arch/early_variables.h>
 #include <assert.h>
 #include <chip.h>
 #include <cpu/x86/mtrr.h>
-- 
cgit v1.2.3