[coreboot-gerrit] Change in ...coreboot[master]: soc/intel/icelake: 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/+/30515 )

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

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 
Reviewed-on: https://review.coreboot.org/c/30515
Tested-by: build bot (Jenkins) 
Reviewed-by: Kyösti Mälkki 
Reviewed-by: Aaron Durbin 
---
M src/soc/intel/icelake/romstage/power_state.c
M src/soc/intel/icelake/romstage/romstage.c
2 files changed, 2 insertions(+), 4 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, but someone else must approve
  Aaron Durbin: Looks good to me, approved

diff --git a/src/soc/intel/icelake/romstage/power_state.c b/src/soc/intel/icelake/romstage/power_state.c
index 3f1a211..fd25217 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 432cae5..3df4f4f 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 @@
    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();