diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-09-06 15:35:12 -0700 |
|---|---|---|
| committer | Stefan Reinauer <reinauer@chromium.org> | 2012-09-11 16:56:00 -0700 |
| commit | 8f9b78d7e01f43da6b100c7880538047dda6eeb0 (patch) | |
| tree | 4c632cc66c3614a2204b673a623bd5c9a560454f | |
| parent | 935f30c8e88d1f0cff8a277d459d99638311c4d0 (diff) | |
| download | vboot-8f9b78d7e01f43da6b100c7880538047dda6eeb0.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)
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: I899d0dbe02540e239ecf3001a90072b88381b35a
Reviewed-on: https://gerrit.chromium.org/gerrit/33019
Tested-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-by: Jay Kim <yongjaek@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 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; |