diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2018-12-29 14:01:12 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-02-13 13:01:12 +0000 |
| commit | e2286782c3fb3cfb6bfb2563629f53e8700334a7 (patch) | |
| tree | a0831522a283fa3cb460c30cb62245bea5704584 | |
| parent | 7ea4e02de667bbe713bec0eb63440a9e2d4962d0 (diff) | |
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 <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/30511
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/soc/intel/baytrail/romstage/romstage.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c index 8de670038b..a4a05dc840 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 @@ asmlinkage void bootblock_c_entry_bist(uint64_t base_timestamp, uint32_t bist) 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 @@ ROMSTAGE_CBMEM_INIT_HOOK(migrate_power_state) 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); |