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>
This commit is contained in:
Tom Wai-Hong Tam
2012-02-13 16:09:36 +08:00
committed by Gerrit
parent ed5fcc0191
commit 2ddd5f6451
2 changed files with 4 additions and 1 deletions

View File

@@ -558,7 +558,8 @@ enum VbKeyCode_t {
VB_KEY_UP = 0x100, VB_KEY_UP = 0x100,
VB_KEY_DOWN = 0x101, VB_KEY_DOWN = 0x101,
VB_KEY_LEFT = 0x102, 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. /* Read the next keypress from the keyboard buffer.

View File

@@ -155,6 +155,8 @@ VbError_t VbBootDeveloper(VbCommonParams* cparams, LoadKernelParams* p) {
VBDEBUG(("VbBootDeveloper() - user pressed Ctrl+D; skip delay\n")); VBDEBUG(("VbBootDeveloper() - user pressed Ctrl+D; skip delay\n"));
goto fallout; goto fallout;
break; break;
/* The Ctrl-Enter is special for Lumpy test purpose. */
case VB_KEY_CTRL_ENTER:
case 0x15: case 0x15:
/* Ctrl+U = try USB boot, or beep if failure */ /* Ctrl+U = try USB boot, or beep if failure */
VBDEBUG(("VbBootDeveloper() - user pressed Ctrl+U; try USB\n")); VBDEBUG(("VbBootDeveloper() - user pressed Ctrl+U; try USB\n"));