diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2012-06-07 02:20:20 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-06-07 14:33:29 -0700 |
| commit | 94ff216f3250ebccd3196423d427c1c9a552590b (patch) | |
| tree | feac1995c7134fad16b8178af9e0e083f83210f5 | |
| parent | 8fcfec5f7f80d521aad34b6b503455de2b84bbc2 (diff) | |
| download | chrome-ec-94ff216f3250ebccd3196423d427c1c9a552590b.tar.gz | |
Don't echo the NV recovery requests back to the BIOS. It knows.
When recovery is required, it will be because there's either a hardware pin
pulled somewhere, or because the recovery_reason is set in NVRAM. Coreboot
and U-Boot can see both of those, so the EC shouldn't make up a new reason.
If it does, it changes the original cause.
BUG=chrome-os-partner:9706
TEST=manual
Reset the EC using ESC+Power (Refresh+Power on EVT). At a root shell, run
crossystem recovery_request=11
reboot
When you see the Recovery screen, press TAB. It should say
recovery_reason: 0x0b We have no idea what this means
Prior to this fix, you'd see recovery_reason 2 instead, which is wrong.
Change-Id: Ie54185471927e7e829962d30bba9d142d593088f
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/24152
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | chip/lm4/power_button.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chip/lm4/power_button.c b/chip/lm4/power_button.c index 1c37ec690d..b144d00b62 100644 --- a/chip/lm4/power_button.c +++ b/chip/lm4/power_button.c @@ -123,12 +123,6 @@ static void update_other_switches(void) else *memmap_switches &= ~EC_SWITCH_DEDICATED_RECOVERY; - /* Was this a reboot requesting recovery? */ - /* TODO: should use a different flag, not the dedicated recovery - * switch flag! */ - if (system_get_recovery_required()) - *memmap_switches |= EC_SWITCH_DEDICATED_RECOVERY; - #ifdef CONFIG_FAKE_DEV_SWITCH if (eoption_get_bool(EOPTION_BOOL_FAKE_DEV)) *memmap_switches |= EC_SWITCH_FAKE_DEVELOPER; |