scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-12 02:45:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only check for boot key on the first boot after keyboard reset

Browse Source 
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 <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/26155
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Randall Spangler
2012-06-26 16:07:55 -07:00
committed by Gerrit
parent 7b155fb8ac
commit b73bfcaa92
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
chip/lm4/keyboard_scan.c
View File

@@ -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;