From b73bfcaa922905a668ff03e8969ce3e96f0a9283 Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Tue, 26 Jun 2012 16:07:55 -0700 Subject: [PATCH] Only check for boot key on the first boot after keyboard reset Don't check if we've jumped to this image (which preserves the reboot reason, so was causing us to re-check). BUG=chrome-os-partner:10890 TEST=manual 1) power+refresh; should see EC print [KB boot key 0] 2) sysjump A; should NOT see [KB boot key 0] Change-Id: I46cc60358e1d1952484f52147787fee06e4ff69f Signed-off-by: Randall Spangler Reviewed-on: https://gerrit.chromium.org/gerrit/26155 Reviewed-by: Simon Glass --- chip/lm4/keyboard_scan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chip/lm4/keyboard_scan.c b/chip/lm4/keyboard_scan.c index 4abb8c7622..acca947707 100644 --- a/chip/lm4/keyboard_scan.c +++ b/chip/lm4/keyboard_scan.c @@ -265,7 +265,8 @@ int keyboard_scan_init(void) * If we're booting due to a reset-pin-caused reset, check what other * single key is held down (if any). */ - if (system_get_reset_cause() == SYSTEM_RESET_RESET_PIN) { + if ((system_get_reset_cause() == SYSTEM_RESET_RESET_PIN) && + !system_jumped_to_this_image()) { const struct boot_key_entry *k = boot_key_list; int i;