From 1d6560fc60d66d36c0a7cf5c51a25f7b185499a7 Mon Sep 17 00:00:00 2001 From: Sheng-Liang Song Date: Wed, 30 Apr 2014 15:46:45 -0700 Subject: chromeos: Unconditionally clear the EC recovery request MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Original-Reviewed-on: https://chromium-review.googlesource.com/197780 Original-Reviewed-by: Aaron Durbin Original-Reviewed-by: Randall Spangler Original-Commit-Queue: Sheng-liang Song Original-Tested-by: Sheng-liang Song (cherry picked from commit 18908bb64cef34ca41812814817ef887961bed34) Signed-off-by: Marc Jones Change-Id: I71ca9f3ea8d816c865375ec66a0603ca211f23ae Reviewed-on: http://review.coreboot.org/7895 Reviewed-by: Kyösti Mälkki Tested-by: build bot (Jenkins) --- src/include/bootmode.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/include/bootmode.h') 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); -- cgit v1.2.3