diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2018-12-29 14:21:25 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-02-13 13:01:16 +0000 |
| commit | 61e18ebdf1d1f16af79bcdd735a26a5a9aedee69 (patch) | |
| tree | 5e26537563a714960f957b74da68bc3d3efeb313 | |
| parent | e2286782c3fb3cfb6bfb2563629f53e8700334a7 (diff) | |
soc/intel/icelake: Don't use CAR_GLOBAL
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>
| -rw-r--r-- | src/soc/intel/icelake/romstage/power_state.c | 1 | ||||
| -rw-r--r-- | src/soc/intel/icelake/romstage/romstage.c | 5 |
2 files changed, 2 insertions, 4 deletions
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(); |