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

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

soc/intel/cannonlake: Don't use CAR_GLOBAL

All platforms using this code have NO_CAR_GLOBAL_MIGRATION.

Change-Id: I72effa93e36156ad35b3e45db449d8d0d0cabf06
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/30514
Tested-by: build bot (Jenkins) 
Reviewed-by: Kyösti Mälkki 
---
M src/mainboard/google/sarien/chromeos.c
M src/soc/intel/cannonlake/romstage/power_state.c
M src/soc/intel/cannonlake/romstage/romstage.c
3 files changed, 3 insertions(+), 6 deletions(-)

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

diff --git a/src/mainboard/google/sarien/chromeos.c b/src/mainboard/google/sarien/chromeos.c
index f9e42e0..4cd6e16 100644
--- a/src/mainboard/google/sarien/chromeos.c
+++ b/src/mainboard/google/sarien/chromeos.c
@@ -14,7 +14,6 @@
  */

#include <arch/acpi.h>
-#include <arch/early_variables.h>
 #include <boot/coreboot_tables.h>
 #include <gpio.h>
 #include <soc/gpio.h>
@@ -31,7 +30,7 @@
    REC_MODE_NOT_REQUESTED,
    REC_MODE_REQUESTED,
 };
-static enum rec_mode_state saved_rec_mode CAR_GLOBAL;
+static enum rec_mode_state saved_rec_mode;

void fill_lb_gpios(struct lb_gpios *gpios)
 {
@@ -85,7 +84,7 @@

int get_recovery_mode_switch(void)
 {
-	enum rec_mode_state state = car_get_var(saved_rec_mode);
+	enum rec_mode_state state = saved_rec_mode;
    uint8_t recovery_button_state = 0;

/* Check the global variable first. */
@@ -106,7 +105,7 @@
    		REC_MODE_REQUESTED : REC_MODE_NOT_REQUESTED;

/* Store the state in case this is called again in verstage. */
-	car_set_var(saved_rec_mode, state);
+	saved_rec_mode = state;

return state == REC_MODE_REQUESTED;
 }
diff --git a/src/soc/intel/cannonlake/romstage/power_state.c b/src/soc/intel/cannonlake/romstage/power_state.c
index 99a93ac..4214fcc 100644
--- a/src/soc/intel/cannonlake/romstage/power_state.c
+++ b/src/soc/intel/cannonlake/romstage/power_state.c
@@ -14,7 +14,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/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c
index 9224ba6..9e25e55 100644
--- a/src/soc/intel/cannonlake/romstage/romstage.c
+++ b/src/soc/intel/cannonlake/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>