summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2012-07-16 10:34:32 -0700
committerGerrit <chrome-bot@google.com>2012-07-18 15:51:36 -0700
commit0255a72d0784ff9557a5f0da7484c9c796299617 (patch)
tree6d38eadbe45e24cb920e423ed42f566ca50a5384
parent3f492b471b215f32f10bdaea37e8b4b7ca6109f3 (diff)
downloadchrome-ec-0255a72d0784ff9557a5f0da7484c9c796299617.tar.gz
Stop reporting keyboard recovery switch
This uses the new keyboard recovery EC event to determine when keyboard recovery is requested. It is paired with a change to the EC to stop reporting keyboard recovery as a switch, since that didn't provide a good mechanism for the AP to tell the EC to stop reporting the switch value. This REQUIRES an updated BIOS; without it you won't be able to get into recovery mode manually. You'll need to press space at the developer screen, or use the debug console to request recovery. Your BIOS must have https://gerrit.chromium.org/gerrit/27509. BUG=chrome-os-partner:10034 TEST=manual 1. boot using power+refresh+esc. See insert screen. 2. power button to power off 3. power button to power on. Boots to Chrome OS (not insert screen). Change-Id: I699ce004ed1190044170c4ea810b8969b40f523b Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/27508 Reviewed-by: Bill Richardson <wfrichar@chromium.org>
-rw-r--r--chip/lm4/power_button.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/chip/lm4/power_button.c b/chip/lm4/power_button.c
index 3874393a1b..55bc92e041 100644
--- a/chip/lm4/power_button.c
+++ b/chip/lm4/power_button.c
@@ -117,11 +117,6 @@ static void update_other_switches(void)
else
*memmap_switches &= ~EC_SWITCH_WRITE_PROTECT_DISABLED;
- if (keyboard_scan_recovery_pressed())
- *memmap_switches |= EC_SWITCH_KEYBOARD_RECOVERY;
- else
- *memmap_switches &= ~EC_SWITCH_KEYBOARD_RECOVERY;
-
if (gpio_get_level(GPIO_RECOVERYn) == 0)
*memmap_switches |= EC_SWITCH_DEDICATED_RECOVERY;
else