diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2012-02-16 14:29:28 -0800 |
|---|---|---|
| committer | Duncan Laurie <dlaurie@chromium.org> | 2012-02-16 14:36:39 -0800 |
| commit | 55f34aff543a7b16abc018709b9c1f51a95d923f (patch) | |
| tree | 35c37e2abce5cae1cb63000a5468d30850a0f893 | |
| parent | eda04e8c0df44ebb1ed84b1f767f518af97bcdf8 (diff) | |
| download | vboot-55f34aff543a7b16abc018709b9c1f51a95d923f.tar.gz | |
Revert "Add Ctrl-Enter as an additional key to trigger dev USB boot."
This reverts commit eda04e8c0df44ebb1ed84b1f767f518af97bcdf8.
BUG=chrome-os-partner:8075
Change-Id: I8c6bb237cfa6d087ab4774b41873fd8c87ad0f61
Reviewed-on: https://gerrit.chromium.org/gerrit/16081
Tested-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Ronald G. Minnich <rminnich@chromium.org>
| -rw-r--r-- | firmware/include/vboot_api.h | 3 | ||||
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index a5b061b7..3134eee6 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -558,8 +558,7 @@ enum VbKeyCode_t { VB_KEY_UP = 0x100, VB_KEY_DOWN = 0x101, VB_KEY_LEFT = 0x102, - VB_KEY_RIGHT = 0x103, - VB_KEY_CTRL_ENTER = 0x104, + VB_KEY_RIGHT = 0x103 }; /* Read the next keypress from the keyboard buffer. diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 891807a3..3df978f6 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -155,8 +155,6 @@ VbError_t VbBootDeveloper(VbCommonParams* cparams, LoadKernelParams* p) { VBDEBUG(("VbBootDeveloper() - user pressed Ctrl+D; skip delay\n")); goto fallout; break; - /* The Ctrl-Enter is special for Lumpy test purpose. */ - case VB_KEY_CTRL_ENTER: case 0x15: /* Ctrl+U = try USB boot, or beep if failure */ VBDEBUG(("VbBootDeveloper() - user pressed Ctrl+U; try USB\n")); |