diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-09-06 15:35:12 -0700 |
|---|---|---|
| committer | Duncan Laurie <dlaurie@chromium.org> | 2012-09-25 10:00:10 -0700 |
| commit | f402cd71436fd39c5a4f5368d4e75d56a1bebc54 (patch) | |
| tree | 64299fd4d94e19d7f94489154a8f3c38af7415cd | |
| parent | 63c591e99e59d3fb0e561cb129198012a1e773e5 (diff) | |
| download | vboot-f402cd71436fd39c5a4f5368d4e75d56a1bebc54.tar.gz | |
STOUT-FIRMWARE: 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: Iaf3505128a17d68e0ca9aac56617d73eadd95666
Original-Change-Id: I9ed2fd2ff2380b058f1aa677ccd516d9fd5679d2
Signed-off-by: Marc Jones <marc.jones@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/33669
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Ronald G. Minnich <rminnich@chromium.org>
Reviewed-by: Shawn Nematbakhsh <shawnn@chromium.org>
Tested-by: Shawn Nematbakhsh <shawnn@chromium.org>
| -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 b9a4b62b..7539f21e 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; |