GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/30514
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
Arthur Heymans 2018-12-29 14:20:23 +01:00 committed by Patrick Georgi
parent 1653cc7079
commit 7e8bad4daa
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainboard/google/sarien/chromeos.c
View File

@ -14,7 +14,6 @@
*/ */
#include <arch/acpi.h> #include <arch/acpi.h>
#include <arch/early_variables.h>
#include <boot/coreboot_tables.h> #include <boot/coreboot_tables.h>
#include <gpio.h> #include <gpio.h>
#include <soc/gpio.h> #include <soc/gpio.h>
@ -31,7 +30,7 @@ enum rec_mode_state {
REC_MODE_NOT_REQUESTED, REC_MODE_NOT_REQUESTED,
REC_MODE_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) void fill_lb_gpios(struct lb_gpios *gpios)
{ {
@ -85,7 +84,7 @@ int get_write_protect_state(void)
int get_recovery_mode_switch(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; uint8_t recovery_button_state = 0;
/* Check the global variable first. */ /* Check the global variable first. */
@ -106,7 +105,7 @@ int get_recovery_mode_switch(void)
REC_MODE_REQUESTED : REC_MODE_NOT_REQUESTED; REC_MODE_REQUESTED : REC_MODE_NOT_REQUESTED;
/* Store the state in case this is called again in verstage. */ /* 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; return state == REC_MODE_REQUESTED;
} }

1
src/soc/intel/cannonlake/romstage/power_state.c
View File

@ -14,7 +14,6 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <arch/early_variables.h>
#include <arch/io.h> #include <arch/io.h>
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>

1
src/soc/intel/cannonlake/romstage/romstage.c
View File

@ -14,7 +14,6 @@
*/ */
#include <arch/io.h> #include <arch/io.h>
#include <arch/early_variables.h>
#include <assert.h> #include <assert.h>
#include <chip.h> #include <chip.h>
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>