3 files changed, 14 insertions, 17 deletions

diff --git a/src/soc/intel/quark/romstage/fsp2_0.c b/src/soc/intel/quark/romstage/fsp2_0.c
index e4abcc034a..5ebbacbd2a 100644
--- a/src/soc/intel/quark/romstage/fsp2_0.c
+++ b/src/soc/intel/quark/romstage/fsp2_0.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/early_variables.h>
+#include <arch/symbols.h>
 #include <console/console.h>
 #include <cbmem.h>
 #include "../chip.h"
@@ -85,20 +85,19 @@ asmlinkage void car_stage_c_entry(void)
 	run_postcar_phase(&pcf);
 }
 
-static struct chipset_power_state power_state CAR_GLOBAL;
+static struct chipset_power_state power_state;
 
 struct chipset_power_state *get_power_state(void)
 {
-	return (struct chipset_power_state *)car_get_var_ptr(&power_state);
+	return &power_state;
 }
 
 int fill_power_state(void)
 {
-	struct chipset_power_state *ps = get_power_state();
-
-	ps->prev_sleep_state = 0;
-	printk(BIOS_SPEW, "prev_sleep_state %d\n", ps->prev_sleep_state);
-	return ps->prev_sleep_state;
+	power_state.prev_sleep_state = 0;
+	printk(BIOS_SPEW, "prev_sleep_state %d\n",
+	       power_state.prev_sleep_state);
+	return power_state.prev_sleep_state;
 }
 
 void platform_fsp_memory_init_params_cb(FSPM_UPD *fspm_upd, uint32_t version)
diff --git a/src/soc/intel/quark/romstage/romstage.c b/src/soc/intel/quark/romstage/romstage.c
index f2a280effb..4ac580eb28 100644
--- a/src/soc/intel/quark/romstage/romstage.c
+++ b/src/soc/intel/quark/romstage/romstage.c
@@ -14,7 +14,6 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/early_variables.h>
 #include <cbfs.h>
 #include <console/console.h>
 #include <fsp/util.h>
diff --git a/src/soc/intel/quark/storage_test.c b/src/soc/intel/quark/storage_test.c
index bdf86b1f12..653466a6d9 100644
--- a/src/soc/intel/quark/storage_test.c
+++ b/src/soc/intel/quark/storage_test.c
@@ -13,7 +13,6 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/early_variables.h>
 #include <device/pci_ops.h>
 #include <assert.h>
 #include <cbmem.h>
@@ -29,13 +28,13 @@
 #include <string.h>
 
 #if CONFIG(STORAGE_LOG)
-struct log_entry log[LOG_ENTRIES] CAR_GLOBAL;
-uint8_t log_index CAR_GLOBAL;
-int log_full CAR_GLOBAL;
-long log_start_time CAR_GLOBAL;
+struct log_entry log[LOG_ENTRIES];
+uint8_t log_index;
+int log_full;
+long log_start_time;
 #endif
 
-static uint8_t drivers_storage[256] CAR_GLOBAL;
+static uint8_t drivers_storage[256];
 
 #define STORAGE_DEBUG  BIOS_DEBUG
 #define LOG_DEBUG  (CONFIG(STORAGE_LOG) ? STORAGE_DEBUG : BIOS_NEVER)
@@ -175,7 +174,7 @@ void storage_test(uint32_t bar, int full_initialization)
 	/* Get the structure addresses */
 	media = NULL;
 	if (ENV_ROMSTAGE)
-		media = car_get_var_ptr(drivers_storage);
+		media = (struct storage_media *)drivers_storage;
 	else
 		media = cbmem_find(CBMEM_ID_STORAGE_DATA);
 	sdhci_ctrlr = (void *)(((uintptr_t)(media + 1) + 0x7) & ~7);
@@ -255,7 +254,7 @@ static void copy_storage_structures(int is_recovery)
 	sdhci_ctrlr = (void *)(((uintptr_t)(media + 1) + 0x7) & ~7);
 
 	/* Migrate the data into CBMEM */
-	memcpy(media, car_get_var_ptr(drivers_storage), size);
+	memcpy(media, drivers_storage, size);
 	media->ctrlr = &sdhci_ctrlr->sd_mmc_ctrlr;
 }