summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2012-09-06 15:35:12 -0700
committerGerrit <chrome-bot@google.com>2012-09-06 17:32:33 -0700
commit0b4c02889136d92961dd4a8add8d9b76d91b4904 (patch)
treef9c29ecc93fc25106189eb94350b0270380f6920
parent7b3e34a23645749f6e3ea9deb7427be21f2d181e (diff)
downloadvboot-0b4c02889136d92961dd4a8add8d9b76d91b4904.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) 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>
-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 0fe36366..d36bcb5f 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;