From 39194720234d458cc070442fa04173e5c4291ffb Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Tue, 8 May 2012 12:38:20 -0700 Subject: [PATCH] Change recovery key to ESC on EVT systems Signed-off-by: Randall Spangler 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 --- chip/lm4/keyboard_scan.c | 15 +++++++++++++-- 1 file 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. */