google/stout: Fix build without ChromeOS
Currently we have no developer or recovery mode switches when building without ChromeOS. Change-Id: I49adfcd8408838cf581430970be5efcef11ba06b Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5596 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
parent
5687fc9d21
commit
926a8d1262
|
@ -35,9 +35,6 @@
|
|||
#define ACTIVE_LOW 0
|
||||
#define ACTIVE_HIGH 1
|
||||
|
||||
static int ec_in_rec_mode;
|
||||
static int ec_rec_flag_good;
|
||||
|
||||
void fill_lb_gpios(struct lb_gpios *gpios)
|
||||
{
|
||||
device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
|
||||
|
@ -115,6 +112,8 @@ int get_recovery_mode_switch(void)
|
|||
#ifdef __PRE_RAM__
|
||||
device_t dev = PCI_DEV(0, 0x1f, 0);
|
||||
#else
|
||||
static int ec_in_rec_mode = 0;
|
||||
static int ec_rec_flag_good = 0;
|
||||
device_t dev = dev_find_slot(0, PCI_DEVFN(0x1f,0));
|
||||
#endif
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include <arch/acpi.h>
|
||||
#include <arch/io.h>
|
||||
#include <vendorcode/google/chromeos/chromeos.h>
|
||||
#include <bootmode.h>
|
||||
#include <types.h>
|
||||
#include <console/console.h>
|
||||
#include <ec/quanta/it8518/ec.h>
|
||||
|
@ -43,7 +43,8 @@ void stout_ec_init(void)
|
|||
/*
|
||||
* Important: get_recovery_mode_switch() must be called in EC init.
|
||||
*/
|
||||
get_recovery_mode_switch();
|
||||
if (IS_ENABLED(CONFIG_BOOTMODE_STRAPS))
|
||||
get_recovery_mode_switch();
|
||||
|
||||
/* Unmute */
|
||||
ec_kbc_write_cmd(EC_KBD_CMD_UNMUTE);
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
#include <cpu/x86/bist.h>
|
||||
#include <cpu/x86/msr.h>
|
||||
#include "gpio.h"
|
||||
#include <bootmode.h>
|
||||
#if CONFIG_CHROMEOS
|
||||
#include <vendorcode/google/chromeos/chromeos.h>
|
||||
#endif
|
||||
|
@ -131,7 +132,8 @@ static void early_pch_init(void)
|
|||
static void early_ec_init(void)
|
||||
{
|
||||
u8 ec_status = ec_read(EC_STATUS_REG);
|
||||
int rec_mode = get_recovery_mode_switch();
|
||||
int rec_mode = IS_ENABLED(CONFIG_BOOTMODE_STRAPS) &&
|
||||
get_recovery_mode_switch();
|
||||
|
||||
if (((ec_status & 0x3) == EC_IN_RO_MODE) ||
|
||||
((ec_status & 0x3) == EC_IN_RECOVERY_MODE)) {
|
||||
|
|
Loading…
Reference in New Issue