From 7e8bad4daad8c92911833c06b6492bacfe8efdff Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Sat, 29 Dec 2018 14:20:23 +0100 Subject: soc/intel/cannonlake: Don't use CAR_GLOBAL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/mainboard/google/sarien/chromeos.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/mainboard/google/sarien') diff --git a/src/mainboard/google/sarien/chromeos.c b/src/mainboard/google/sarien/chromeos.c index f9e42e0f69..4cd6e16a95 100644 --- a/src/mainboard/google/sarien/chromeos.c +++ b/src/mainboard/google/sarien/chromeos.c @@ -14,7 +14,6 @@ */ #include -#include #include #include #include @@ -31,7 +30,7 @@ enum rec_mode_state { 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_write_protect_state(void) 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 @@ int get_recovery_mode_switch(void) 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; } -- cgit v1.2.3