summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorSheng-Liang Song <ssl@chromium.org>2014-04-30 15:46:45 -0700
committerMarc Jones <marc.jones@se-eng.com>2014-12-30 23:30:52 +0100
commit1d6560fc60d66d36c0a7cf5c51a25f7b185499a7 (patch)
treed2d44426c2d11c1b57436ccd9485ad7c442f5a9b /src/include
parentafde961adfcba92b30b422b8eb681d91c257de34 (diff)
downloadcoreboot-1d6560fc60d66d36c0a7cf5c51a25f7b185499a7.tar.xz
chromeos: Unconditionally clear the EC recovery request
Add the empty weak function clear_recovery_mode_switch(). Problem: If GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC is set, the following will happen: 1. Boot device in recovery mode with Esc + F3 + Pwr. 2. Turn device off with Pwr button. 3. Turn device on with Pwr button. Device still boots to recovery screen with recovery_reason:0x02 recovery button pressed. If GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC isn't set, turning the device off and on again with the Pwr button does a normal boot. Solution: Unconditionally clear the recovery flag. BUG=chromium:279607 BRANCH=TOT TEST=Compile OK. Original-Change-Id: Ie1e3251a6db12e75e385220e9d3791078393b1bf Original-Signed-off-by: Sheng-Liang Song <ssl@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/197780 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Original-Reviewed-by: Randall Spangler <rspangler@chromium.org> Original-Commit-Queue: Sheng-liang Song <ssl@google.com> Original-Tested-by: Sheng-liang Song <ssl@google.com> (cherry picked from commit 18908bb64cef34ca41812814817ef887961bed34) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: I71ca9f3ea8d816c865375ec66a0603ca211f23ae Reviewed-on: http://review.coreboot.org/7895 Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/include')
-rw-r--r--src/include/bootmode.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/include/bootmode.h b/src/include/bootmode.h
index 323668b321..55e3f5f36f 100644
--- a/src/include/bootmode.h
+++ b/src/include/bootmode.h
@@ -25,6 +25,8 @@ void init_bootmode_straps(void);
int get_write_protect_state(void);
int get_developer_mode_switch(void);
int get_recovery_mode_switch(void);
+int clear_recovery_mode_switch(void);
+
int gfx_get_init_done(void);
void gfx_set_init_done(int done);