diff options
author | Randall Spangler <rspangler@chromium.org> | 2012-09-06 15:35:12 -0700 |
---|---|---|
committer | Shawn Nematbakhsh <shawnn@google.com> | 2012-10-17 16:52:17 -0700 |
commit | 3a8345120573ac40cf237ab7a31474b83effe700 (patch) | |
tree | 5015dd9f943dc958102bb791ced86a01de28a64c | |
parent | 9c17563a9ddc8fc1d05a485683bd1c4a5f795dff (diff) | |
download | vboot-3a8345120573ac40cf237ab7a31474b83effe700.tar.gz |
BUTTERFLY-FIRMWARE: Esc at DEV screen no longer triggers TONORM
BUG=chrome-os-partner:13765
BRANCH=all
TEST=manual, test basic firmware functions.
Change-Id: I9f412814b988ac345b82186686c152523891881d
Original-Change-Id: I9ed2fd2ff2380b058f1aa677ccd516d9fd5679d2
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/35783
Reviewed-by: Shawn Nematbakhsh <shawnn@google.com>
Tested-by: Shawn Nematbakhsh <shawnn@google.com>
-rw-r--r-- | firmware/lib/vboot_api_kernel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 41653084..c0261e89 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 && @@ -226,7 +225,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; |