diff options
| author | Tom Wai-Hong Tam <waihong@chromium.org> | 2012-02-13 16:09:36 +0800 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-02-14 22:25:53 -0800 |
| commit | 2ddd5f64515b4be9847a16de793c59b161221e1b (patch) | |
| tree | 1a01b8426bfe7b70f537e920760786a4e246ad90 | |
| parent | ed5fcc0191ca1ce959b4614f3f6fa861135f506f (diff) | |
| download | vboot-2ddd5f64515b4be9847a16de793c59b161221e1b.tar.gz | |
Add Ctrl-Enter as an additional key to trigger dev USB boot.
Due to the limitation of servo that is unable to send U keys, dev USB boot
(triggered by Ctrl-U) is unable to be tested on FAFT. To solve it, firmware
should add an addition key combination to workaround it. Ctrl-Enter is the
one we picked.
BUG=chrome-os-partner:6759
TEST=compile the firmware and update it to Lumpy; during the dev screen,
press Ctrl-Enter to trigger USB boot.
Change-Id: I8215a241c3c07dc2f5e194c324459f106d007f47
Reviewed-on: https://gerrit.chromium.org/gerrit/15749
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Ready: Tom Wai-Hong Tam <waihong@chromium.org>
Tested-by: Tom Wai-Hong Tam <waihong@chromium.org>
| -rw-r--r-- | firmware/include/vboot_api.h | 3 | ||||
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index 3134eee6..a5b061b7 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -558,7 +558,8 @@ enum VbKeyCode_t { VB_KEY_UP = 0x100, VB_KEY_DOWN = 0x101, VB_KEY_LEFT = 0x102, - VB_KEY_RIGHT = 0x103 + VB_KEY_RIGHT = 0x103, + VB_KEY_CTRL_ENTER = 0x104, }; /* 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 3df978f6..891807a3 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -155,6 +155,8 @@ 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")); |