From 767a12c659e9ff03053ad2f691094d9efeb9e5e6 Mon Sep 17 00:00:00 2001 From: Nicolas Boichat Date: Sat, 14 Jan 2017 17:33:21 +0800 Subject: 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 Tested-by: Nicolas Boichat Reviewed-by: Randall Spangler Reviewed-by: Shawn N --- chip/npcx/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1