commit f88e5e7783088d945c1566b370ce0a37e8c4b96d
author Furquan Shaikh <furquan@google.com> Sat Jun 20 15:53:19 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed Jun 24 00:04:53 2015 +0000
tree 983990d4e4725b8ab0d16d8c7cfb3987cc4ddb9f
parent cf80de709d2bf310a3a37b9897063d2d833933b9

smaug: Enter recovery mode for EC FASTBOOT_MODE event

BUG=None
BRANCH=None
TEST=Compiles successfully and enters recovery mode on fastboot mode
event as well

Change-Id: Id14046eb79247a86f712373f23c078556930fe72
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/280930
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Trybot-Ready: Furquan Shaikh <furquan@chromium.org>

src/mainboard/google/smaug/chromeos.c

diff --git a/src/mainboard/google/smaug/chromeos.c b/src/mainboard/google/smaug/chromeos.c
index f13be05..2a24d01 100644
--- a/src/mainboard/google/smaug/chromeos.c
+++ b/src/mainboard/google/smaug/chromeos.c
@@ -97,8 +97,12 @@
 	uint32_t ec_events;
 
 	ec_events = google_chromeec_get_events_b();
-	return !!(ec_events &
-		  EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));
+
+	/* Enter recovery mode either on keyboard recovery / fastboot event. */
+	return !!((ec_events &
+		   EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY)) ||
+		  (ec_events &
+		   EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_FASTBOOT)));
 }
 
 int get_write_protect_state(void)