summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@google.com>2017-01-14 17:33:21 +0800
committerchrome-bot <chrome-bot@chromium.org>2017-01-20 00:05:06 -0800
commit767a12c659e9ff03053ad2f691094d9efeb9e5e6 (patch)
treee72c4add8508f3f060afe72369567a8ee7f68469
parent78b9a4877932540bc0ab56456eaf121d5b0a6b37 (diff)
downloadchrome-ec-767a12c659e9ff03053ad2f691094d9efeb9e5e6.tar.gz
poppy: consider all EC boots to be due to pin reset
Similarly to eve, we have a problem where the EC is not able to distinguish between power up and reset, as VCC1_RST is simply tied to PP3300_DSW. BRANCH=none BUG=chrome-os-partner:61028 BUG=chrome-os-partner:61930 TEST=Press Power+Volume Up+Volume Down, poppy enters recovery Change-Id: Id0d89b56058e288c14e10eee7656965eee75047a Reviewed-on: https://chromium-review.googlesource.com/428532 Commit-Ready: Nicolas Boichat <drinkcat@chromium.org> Tested-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-by: Randall Spangler <rspangler@chromium.org> Reviewed-by: Shawn N <shawnn@chromium.org>
-rw-r--r--chip/npcx/system.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/chip/npcx/system.c b/chip/npcx/system.c
index a0c0a749f0..fb310eea4e 100644
--- a/chip/npcx/system.c
+++ b/chip/npcx/system.c
@@ -169,7 +169,7 @@ void system_check_reset_cause(void)
/* Use scratch bit to check power on reset or VCC1_RST reset */
if (!IS_BIT_SET(NPCX_RSTCTL, NPCX_RSTCTL_VCC1_RST_SCRATCH)) {
-#if defined(BOARD_WHEATLEY) || defined(BOARD_EVE)
+#if defined(BOARD_WHEATLEY) || defined(BOARD_EVE) || defined(BOARD_POPPY)
/* TODO(crosbug.com/p/61028): Remove workaround for Eve */
flags |= RESET_FLAG_RESET_PIN;
#else