[coreboot-gerrit] Change in ...coreboot[master]: soc/intel/baytrail: Don't use CAR_GLOBAL

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30511 )

Change subject: soc/intel/baytrail: Don't use CAR_GLOBAL
......................................................................

soc/intel/baytrail: Don't use CAR_GLOBAL

All platforms using this code have NO_CAR_GLOBAL_MIGRATION.

Change-Id: I731bc1c9dec6cb5bbb228b7949a73848cb73eee3
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/30511
Reviewed-by: Kyösti Mälkki 
Tested-by: build bot (Jenkins) 
---
M src/soc/intel/baytrail/romstage/romstage.c
1 file changed, 3 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved

diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c
index 8de6700..a4a05dc 100644
--- a/src/soc/intel/baytrail/romstage/romstage.c
+++ b/src/soc/intel/baytrail/romstage/romstage.c
@@ -16,7 +16,6 @@
 #include <stddef.h>
 #include <arch/cpu.h>
 #include <arch/io.h>
-#include <arch/early_variables.h>
 #include <bootblock_common.h>
 #include <console/console.h>
 #include <cbmem.h>
@@ -141,14 +140,14 @@
    romstage_main(base_timestamp, bist);
 }

-static struct chipset_power_state power_state CAR_GLOBAL;
+static struct chipset_power_state power_state;

static void migrate_power_state(int is_recovery)
 {
    struct chipset_power_state *ps_cbmem;
    struct chipset_power_state *ps_car;

-	ps_car = car_get_var_ptr(&power_state);
+	ps_car = &power_state;
    ps_cbmem = cbmem_add(CBMEM_ID_POWER_STATE, sizeof(*ps_cbmem));

if (ps_cbmem == NULL) {
@@ -161,7 +160,7 @@

static struct chipset_power_state *fill_power_state(void)
 {
-	struct chipset_power_state *ps = car_get_var_ptr(&power_state);
+	struct chipset_power_state *ps = &power_state;

ps->pm1_sts = inw(ACPI_BASE_ADDRESS + PM1_STS);
    ps->pm1_en = inw(ACPI_BASE_ADDRESS + PM1_EN);