From 61e18ebdf1d1f16af79bcdd735a26a5a9aedee69 Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Sat, 29 Dec 2018 14:21:25 +0100
Subject: soc/intel/icelake: 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: Ia210af6ef1a97da67d00036070faa1ceb3ce250b
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/30515
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/soc/intel/icelake/romstage/power_state.c | 1 -
 src/soc/intel/icelake/romstage/romstage.c    | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/soc/intel/icelake')

diff --git a/src/soc/intel/icelake/romstage/power_state.c b/src/soc/intel/icelake/romstage/power_state.c
index 3f1a211c6c..fd25217cba 100644
--- a/src/soc/intel/icelake/romstage/power_state.c
+++ b/src/soc/intel/icelake/romstage/power_state.c
@@ -13,7 +13,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/icelake/romstage/romstage.c b/src/soc/intel/icelake/romstage/romstage.c
index 432cae5f33..3df4f4f8c5 100644
--- a/src/soc/intel/icelake/romstage/romstage.c
+++ b/src/soc/intel/icelake/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>
@@ -33,7 +32,7 @@
 #include <string.h>
 #include <timestamp.h>
 
-static struct chipset_power_state power_state CAR_GLOBAL;
+static struct chipset_power_state power_state;
 
 #define FSP_SMBIOS_MEMORY_INFO_GUID	\
 {	\
@@ -112,7 +111,7 @@ asmlinkage void car_stage_entry(void)
 	bool s3wake;
 	struct postcar_frame pcf;
 	uintptr_t top_of_ram;
-	struct chipset_power_state *ps = car_get_var_ptr(&power_state);
+	struct chipset_power_state *ps = &power_state;
 
 	console_init();
 
-- 
cgit v1.2.3