summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2012-09-06 15:35:12 -0700
committerChe-Liang Chiou <clchiou@chromium.org>2012-09-06 18:33:04 -0700
commit19d2dc0ad3ad909c17721fc9371bd0ce69145286 (patch)
tree0214669819e463beaf905c438b4a62c3c1cc6179
parenteb8b61f343e6ab8e510ef9a22ec285f6e6c48a17 (diff)
downloadvboot-19d2dc0ad3ad909c17721fc9371bd0ce69145286.tar.gz
Esc at DEV screen no longer triggers TONORM
BUG=chrome-os-partner:13765 BRANCH=all TEST=manual 1. boot in dev mode. see DEV screen 2. press space -> TONORM 3. press esc -> DEV 4. press esc -> (still at DEV) Original-Change-Id: I9ed2fd2ff2380b058f1aa677ccd516d9fd5679d2 Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/32454 Reviewed-by: Duncan Laurie <dlaurie@chromium.org> (cherry picked from commit 0b4c02889136d92961dd4a8add8d9b76d91b4904) Change-Id: I0a98c6318c81f2141dd708656e2cfa51244ce453 Reviewed-on: https://gerrit.chromium.org/gerrit/32474 Reviewed-by: Che-Liang Chiou <clchiou@chromium.org> Tested-by: Che-Liang Chiou <clchiou@chromium.org>
-rw-r--r--firmware/lib/vboot_api_kernel.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
index c9b38bc6..95a7bb80 100644
--- a/firmware/lib/vboot_api_kernel.c
+++ b/firmware/lib/vboot_api_kernel.c
@@ -193,7 +193,6 @@ VbError_t VbBootDeveloper(VbCommonParams* cparams, LoadKernelParams* p) {
if (!(gbb->flags & GBB_FLAG_ENTER_TRIGGERS_TONORM))
break;
case ' ':
- case 0x1B:
/* See if we should disable the virtual dev-mode switch. */
VBDEBUG(("%s shared->flags=0x%x\n", __func__, shared->flags));
if (shared->flags & VBSD_HONOR_VIRT_DEV_SWITCH &&
@@ -217,7 +216,7 @@ VbError_t VbBootDeveloper(VbCommonParams* cparams, LoadKernelParams* p) {
}
} else {
/* No virtual dev-mode switch, so go directly to recovery mode */
- VBDEBUG(("VbBootDeveloper() - user pressed ENTER/SPACE/ESC\n"));
+ VBDEBUG(("%s() - going to recovery\n", __func__));
VbSetRecoveryRequest(VBNV_RECOVERY_RW_DEV_SCREEN);
VbAudioClose(audio);
return VBERROR_LOAD_KERNEL_RECOVERY;