diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2017-08-31 18:36:17 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-09-07 15:01:05 -0700 |
| commit | 0898c7a63a4ccb0f11c1c61bb085d8d062f664ab (patch) | |
| tree | 328298c6608da573904a497af5985db7280d686f /chip/npcx/system.c | |
| parent | 096ea20ed18095a967e1829b6ae60b13453416be (diff) | |
| download | chrome-ec-0898c7a63a4ccb0f11c1c61bb085d8d062f664ab.tar.gz | |
cleanup: Remove jtag_pre_init()
Use our newly-created chip_pre_init() for doing JTAG initialization.
BUG=chromium:747629
BRANCH=None
TEST=`make buildall -j`
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: Ic5771895a214a9f1aa9bd289eef576f52adf973f
Reviewed-on: https://chromium-review.googlesource.com/629676
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'chip/npcx/system.c')
| -rw-r--r-- | chip/npcx/system.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/chip/npcx/system.c b/chip/npcx/system.c index a81c3cd383..012a508208 100644 --- a/chip/npcx/system.c +++ b/chip/npcx/system.c @@ -632,6 +632,27 @@ void system_hibernate(uint32_t seconds, uint32_t microseconds) #endif } +void chip_pre_init(void) +{ + /* Setting for fixing JTAG issue */ + NPCX_DBGCTRL = 0x04; + /* Enable automatic freeze mode */ + CLEAR_BIT(NPCX_DBGFRZEN3, NPCX_DBGFRZEN3_GLBL_FRZ_DIS); + + /* + * Enable JTAG functionality by SW without pulling down strap-pin + * nJEN0 or nJEN1 during ec POWERON or VCCRST reset occurs. + * Please notice it will change pinmux to JTAG directly. + */ +#ifdef NPCX_ENABLE_JTAG +#if NPCX_JTAG_MODULE2 + CLEAR_BIT(NPCX_DEVALT(ALT_GROUP_5), NPCX_DEVALT5_NJEN1_EN); +#else + CLEAR_BIT(NPCX_DEVALT(ALT_GROUP_5), NPCX_DEVALT5_NJEN0_EN); +#endif +#endif +} + void system_pre_init(void) { /* |