diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-04-01 14:22:12 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-04-02 14:12:58 -0700 |
| commit | 23bbebaeb98b2c8da7e8c24414e0f1cc068cda52 (patch) | |
| tree | 051d7c2b31d6906fd4e7d3b7454c458a9cd1365e | |
| parent | bdd16f82069f9e07e9a9e3008c318d9581ce0664 (diff) | |
| download | chrome-ec-23bbebaeb98b2c8da7e8c24414e0f1cc068cda52.tar.gz | |
Remove unused EC_SWITCH_KEYBOARD_RECOVERY
This was left over from the way we reported keyboard recovery early in
link/snow, before we had host events. No shipping EC ever reported it.
Coreboot and u-boot look for this flag, so we can't repurpose it until
they ignore it too.
BUG=chrome-os-partner:18512
BRANCH=none
TEST=compile link,spring
Change-Id: I38fbf0fa7d958c3774c8b293d4be25faaecdadea
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/47058
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
| -rw-r--r-- | include/ec_commands.h | 6 | ||||
| -rw-r--r-- | util/ectool.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/ec_commands.h b/include/ec_commands.h index cd714cc1db..17e35a1355 100644 --- a/include/ec_commands.h +++ b/include/ec_commands.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -122,8 +122,8 @@ #define EC_SWITCH_LID_OPEN 0x01 #define EC_SWITCH_POWER_BUTTON_PRESSED 0x02 #define EC_SWITCH_WRITE_PROTECT_DISABLED 0x04 -/* Recovery requested via keyboard */ -#define EC_SWITCH_KEYBOARD_RECOVERY 0x08 +/* Was recovery requested via keyboard; now unused. */ +#define EC_SWITCH_IGNORE1 0x08 /* Recovery requested via dedicated signal (from servo board) */ #define EC_SWITCH_DEDICATED_RECOVERY 0x10 /* Was fake developer mode switch; now unused. Remove in next refactor. */ diff --git a/util/ectool.c b/util/ectool.c index 3804170b8d..0332ea6c45 100644 --- a/util/ectool.c +++ b/util/ectool.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -1861,8 +1861,6 @@ int cmd_switches(int argc, char *argv[]) (s & EC_SWITCH_POWER_BUTTON_PRESSED ? "DOWN" : "UP")); printf("Write protect: %sABLED\n", (s & EC_SWITCH_WRITE_PROTECT_DISABLED ? "DIS" : "EN")); - printf("Keyboard recovery: %sABLED\n", - (s & EC_SWITCH_KEYBOARD_RECOVERY ? "EN" : "DIS")); printf("Dedicated recovery: %sABLED\n", (s & EC_SWITCH_DEDICATED_RECOVERY ? "EN" : "DIS")); |