Skip to content

Commit

Permalink
Merge pull request #14524 from OpenNuvoton/nuvoton_m487_adjust-wdt-re…
Browse files Browse the repository at this point in the history
…set-reglock

M487: Adjust placement of SYS_UnlockReg in WDT reset code
  • Loading branch information
0xc0170 authored Apr 12, 2021
2 parents f2b2f42 + df4f1a3 commit 1aa38b4
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions targets/TARGET_NUVOTON/TARGET_M480/mbed_overrides.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ void mbed_sdk_init(void)
* start of boot process on detecting WDT reset.
*/
if (SYS_IS_WDT_RST()) {
/* Re-unlock to highlight WDT clock setting is protected */
SYS_UnlockReg();

/* Enable IP module clock */
CLK_EnableModuleClock(WDT_MODULE);

Expand All @@ -108,8 +111,6 @@ void mbed_sdk_init(void)
*/
NVIC_EnableIRQ(WDT_IRQn);

SYS_UnlockReg();

/* Configure/Enable WDT */
WDT->CTL = WDT_TIMEOUT_2POW4 | // Timeout interval of 2^4 LIRC clocks
WDT_CTL_WDTEN_Msk | // Enable watchdog timer
Expand All @@ -123,6 +124,9 @@ void mbed_sdk_init(void)

CLK_PowerDown();

/* Re-unlock for safe */
SYS_UnlockReg();

/* Clear all flags & Disable WDT/INT/WK/RST */
WDT->CTL = (WDT_CTL_WKF_Msk | WDT_CTL_IF_Msk | WDT_CTL_RSTF_Msk | WDT_CTL_RSTCNT_Msk);

Expand Down

0 comments on commit 1aa38b4

Please sign in to comment.