diff options
| author | Randall Spangler <rspangler@chromium.org> | 2012-05-08 12:38:20 -0700 |
|---|---|---|
| committer | Randall Spangler <rspangler@chromium.org> | 2012-05-08 21:07:09 -0700 |
| commit | 39194720234d458cc070442fa04173e5c4291ffb (patch) | |
| tree | 417a0805189c6bd26a426937c1af30d763d84178 | |
| parent | 8ea7983c298cb33b7e1b0a063a3a98408d2779ab (diff) | |
| download | chrome-ec-39194720234d458cc070442fa04173e5c4291ffb.tar.gz | |
Change recovery key to ESC on EVT systems
Signed-off-by: Randall Spangler <rspangler@chromium.org>
BUG=chrome-os-partner:9554
TEST=manual
1) Boot system. No recovery.
2) Boot system holding down Refresh+Esc. No recovery.
3) Hold down Power+Esc. System reboots and stays shut down.
4) Hold down Power+Esc+Refresh. System reboots into recovery mode.
Change-Id: I53db224b6d2a03406244e79fb64fb67851919857
| -rw-r--r-- | chip/lm4/keyboard_scan.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/chip/lm4/keyboard_scan.c b/chip/lm4/keyboard_scan.c index 2e00bbdc02..39618ba70f 100644 --- a/chip/lm4/keyboard_scan.c +++ b/chip/lm4/keyboard_scan.c @@ -375,8 +375,19 @@ int keyboard_scan_init(void) /* If we're booting due to a reset-pin-caused reset, check if the * recovery key is pressed. */ if (system_get_reset_cause() == SYSTEM_RESET_RESET_PIN) { - recovery_key_pressed = check_boot_key(MASK_INDEX_REFRESH, - MASK_VALUE_REFRESH); + /* Proto1 used ESC key */ + /* TODO: (crosbug.com/p/9561) remove once proto1 obsolete */ +#ifdef BOARD_link + if (system_get_board_version() == BOARD_VERSION_PROTO1) { + recovery_key_pressed = + check_boot_key(MASK_INDEX_REFRESH, + MASK_VALUE_REFRESH); + } else +#endif + { + recovery_key_pressed = + check_boot_key(MASK_INDEX_ESC, MASK_VALUE_ESC); + } #ifdef CONFIG_FAKE_DEV_SWITCH /* Turn fake dev switch on if D pressed, off if F pressed. */ |