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>
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h
index a5b061b..3134eee 100644
--- a/firmware/include/vboot_api.h
+++ b/firmware/include/vboot_api.h
@@ -558,8 +558,7 @@
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 891807a..3df978f 100644
--- a/firmware/lib/vboot_api_kernel.c
+++ b/firmware/lib/vboot_api_kernel.c
@@ -155,8 +155,6 @@
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"));
