summaryrefslogtreecommitdiff
path: root/board/atlas
diff options
context:
space:
mode:
authorCaveh Jalali <caveh@google.com>2018-08-02 22:52:23 +0000
committerchrome-bot <chrome-bot@chromium.org>2018-08-03 01:31:22 -0700
commit0895ce120e605ddd24bb22742801d699d72921b7 (patch)
tree6e4d4aa73b90e8ae0fe92407c9e7aa8ee4119d5d /board/atlas
parentd2341b237f750b1b5daf7e92fb47e12d3316f7ec (diff)
downloadchrome-ec-0895ce120e605ddd24bb22742801d699d72921b7.tar.gz
Revert "atlas: do not fake power-on as reset-pin"
This reverts commit fc1496d1bb84f74d539bc11a205d90926dc79740. this change prevented us from entering recovery mode using the 3-finger salute. the keyboard_scan.c:check_boot_key() depends the reset pin being asserted as a prerequisite to checking the refresh key has been pressed. this means we never get as far as checking for the 3-finger salute key combo. BUG=b:75070158,b:111577561 BRANCH=stabilize-atlas.10819.B TEST=3-finger salute now gets us into recovery Original change's description: > atlas: do not fake power-on as reset-pin > > atlas can detect a power-on reset, so we don't need to fake it as a > reset-pin initiated reset. > > BUG=b:75070158 > BRANCH=none > TEST=EC now claims the reset cause was power-on instead of reset on > cold boot > > Change-Id: I0b0a58f79b605e768719249f1c139f6d46fec30b > Signed-off-by: Caveh Jalali <caveh@chromium.org> > Reviewed-on: https://chromium-review.googlesource.com/1098531 > Commit-Ready: Caveh Jalali <caveh@google.com> > Tested-by: Caveh Jalali <caveh@google.com> > Reviewed-by: Aseda Aboagye <aaboagye@chromium.org> Bug: b:75070158 Change-Id: Ia3bb9ccecbb69e35b1cec48dabfc5e99b29a3b17 Reviewed-on: https://chromium-review.googlesource.com/1161226 Commit-Ready: Caveh Jalali <caveh@google.com> Tested-by: Caveh Jalali <caveh@google.com> Reviewed-by: Caveh Jalali <caveh@google.com>
Diffstat (limited to 'board/atlas')
-rw-r--r--board/atlas/board.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/board/atlas/board.h b/board/atlas/board.h
index 4d863adda9..55171d80f3 100644
--- a/board/atlas/board.h
+++ b/board/atlas/board.h
@@ -26,6 +26,7 @@
#define CONFIG_ADC
#define CONFIG_BACKLIGHT_LID
#define CONFIG_BOARD_VERSION_CUSTOM
+#define CONFIG_BOARD_FORCE_RESET_PIN
#define CONFIG_DPTF
#define CONFIG_FPU
#define CONFIG_I2C