summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2020-02-08 12:23:23 +0800
committerJoel Kitching <kitching@google.com>2020-02-17 08:08:19 +0000
commit81726663bcfe07234eb286ec5eddbff5e55be813 (patch)
treec07bb1a1272808b2d606c63ad5e219fa52c63bea /src/mainboard
parente921911f1008169d236c4d2bd3e169a176cdf45c (diff)
downloadcoreboot-81726663bcfe07234eb286ec5eddbff5e55be813.tar.xz
vboot: push clear recovery mode switch until BS_WRITE_TABLES
Serves two purposes: (1) On some platforms, FSP initialization may cause a reboot. Push clearing the recovery mode switch until after FSP code runs, so that a manual recovery request (three-finger salute) will function correctly under this condition. (2) The recovery mode switch value is needed at BS_WRITE_TABLES for adding an event to elog. (Previously this was done by stashing the value in CBMEM_ID_EC_HOSTEVENT.) BUG=b:124141368, b:35576380 TEST=make clean && make test-abuild BRANCH=none Change-Id: I30c02787c620b937e5a50a5ed94ac906e3112dad Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/38779 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/intel/galileo/vboot.c10
-rw-r--r--src/mainboard/intel/kblrvp/chromeos.c10
2 files changed, 0 insertions, 20 deletions
diff --git a/src/mainboard/intel/galileo/vboot.c b/src/mainboard/intel/galileo/vboot.c
index 8b6706c15c..3ec5bb3b44 100644
--- a/src/mainboard/intel/galileo/vboot.c
+++ b/src/mainboard/intel/galileo/vboot.c
@@ -24,12 +24,6 @@
#include "gen1.h"
#include "gen2.h"
-int clear_recovery_mode_switch(void)
-{
- /* Nothing to do */
- return 0;
-}
-
int get_recovery_mode_switch(void)
{
return 0;
@@ -41,10 +35,6 @@ int get_write_protect_state(void)
return 0;
}
-void log_recovery_mode_switch(void)
-{
-}
-
void verstage_mainboard_init(void)
{
const struct reg_script *script;
diff --git a/src/mainboard/intel/kblrvp/chromeos.c b/src/mainboard/intel/kblrvp/chromeos.c
index 9db46744bc..647a4302b2 100644
--- a/src/mainboard/intel/kblrvp/chromeos.c
+++ b/src/mainboard/intel/kblrvp/chromeos.c
@@ -62,16 +62,6 @@ int get_recovery_mode_switch(void)
return 0;
}
-int clear_recovery_mode_switch(void)
-{
- if (CONFIG(EC_GOOGLE_CHROMEEC))
- /* Clear keyboard recovery event. */
- return google_chromeec_clear_events_b(
- EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));
-
- return 0;
-}
-
int get_write_protect_state(void)
{
/* No write protect */