mirror of
https://github.com/linux-msm/openocd.git
synced 2026-02-25 13:15:07 -08:00
flash Kinetis: handle all types of watchdog, disable in reset-init
Active watchdog forces reset during armv7m_checksum_memory() in verify_image command if run just after reset init. COP watchdog in KL series and WDOG32 in KE1 series have longer timeout however they need to be disabled too. The change extends 'kinetis disable_wdog' command to optionally probe the chip and use appropriate algorithm to disable watchdog. Setting of cache type is also split from flash_support flags. Tcl command 'kinetis disable_wdog' is called in reset-init event. Change-Id: I3191e230f38b679ed74f2a97fe323ef8fb3fe22e Signed-off-by: Tomas Vanek <vanekt@fbl.cz> Reviewed-on: http://openocd.zylin.com/3901 Tested-by: jenkins Reviewed-by: Joakim Nohlgård <joakim.nohlgard@eistec.se> Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
This commit is contained in:
Tomas Vanek
committed by
Freddie Chopin
Freddie Chopin
parent
c4d4c32a50
commit
5a2608bbbc
@@ -6,7 +6,7 @@ ARM_OBJCOPY ?= $(ARM_CROSS_COMPILE)objcopy
|
||||
|
||||
ARM_AFLAGS = -EL -mthumb
|
||||
|
||||
arm: armv7m_kinetis_wdog.inc
|
||||
arm: armv7m_kinetis_wdog.inc armv7m_kinetis_wdog32.inc
|
||||
|
||||
armv7m_%.elf: armv7m_%.s
|
||||
$(ARM_AS) $(ARM_AFLAGS) $< -o $@
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
/* Autogenerated with ../../../src/helper/bin2char.sh */
|
||||
0x04,0x4b,0x05,0x4a,0xda,0x81,0x05,0x4a,0xda,0x81,0x01,0x24,0x1a,0x88,0xa2,0x43,
|
||||
0x1a,0x80,0x06,0xe0,0x00,0x20,0x05,0x40,0x20,0xc5,0x00,0x00,0x28,0xd9,0x00,0x00,
|
||||
0x00,0x00,0x00,0xbe,
|
||||
0x04,0x4a,0xc2,0x81,0x04,0x4a,0xc2,0x81,0x01,0x24,0x02,0x88,0xa2,0x43,0x02,0x80,
|
||||
0x05,0xe0,0x00,0x00,0x20,0xc5,0x00,0x00,0x28,0xd9,0x00,0x00,0x00,0x00,0x00,0xbe,
|
||||
|
||||
@@ -19,7 +19,9 @@
|
||||
|
||||
/*
|
||||
Disable watchdog for Kinetis Kx and KVx
|
||||
Parameters: none
|
||||
Parameters:
|
||||
r0 ... WDOG base (in)
|
||||
|
||||
Used instruction set should work on both Cortex-M4 and M0+
|
||||
*/
|
||||
|
||||
@@ -28,7 +30,6 @@
|
||||
.cpu cortex-m0
|
||||
.thumb
|
||||
|
||||
WDOG_ADDR = 0x40052000
|
||||
/* WDOG registers offsets */
|
||||
WDOG_STCTRLH = 0
|
||||
WDOG_UNLOCK = 0x0e
|
||||
@@ -39,17 +40,16 @@ WDOG_KEY2 = 0xd928
|
||||
.thumb_func
|
||||
start:
|
||||
/* WDOG_UNLOCK = 0xC520 */
|
||||
ldr r3, =WDOG_ADDR
|
||||
ldr r2, =WDOG_KEY1
|
||||
strh r2, [r3, WDOG_UNLOCK]
|
||||
strh r2, [r0, WDOG_UNLOCK]
|
||||
/* WDOG_UNLOCK = 0xD928 */
|
||||
ldr r2, =WDOG_KEY2
|
||||
strh r2, [r3, WDOG_UNLOCK]
|
||||
strh r2, [r0, WDOG_UNLOCK]
|
||||
/* WDOG_STCTRLH clear bit 0 */
|
||||
movs r4, #1
|
||||
ldrh r2, [r3, WDOG_STCTRLH]
|
||||
ldrh r2, [r0, WDOG_STCTRLH]
|
||||
bics r2, r4
|
||||
strh r2, [r3, WDOG_STCTRLH]
|
||||
strh r2, [r0, WDOG_STCTRLH]
|
||||
/* OpenOCD checks exit point address. Jump to the very end. */
|
||||
b done
|
||||
|
||||
|
||||
5
contrib/loaders/watchdog/armv7m_kinetis_wdog32.inc
Normal file
5
contrib/loaders/watchdog/armv7m_kinetis_wdog32.inc
Normal file
@@ -0,0 +1,5 @@
|
||||
/* Autogenerated with ../../../src/helper/bin2char.sh */
|
||||
0x02,0x68,0x08,0x4b,0x1a,0x42,0x08,0x4b,0x01,0xd0,0x43,0x60,0x02,0xe0,0x83,0x80,
|
||||
0x1b,0x0c,0x83,0x80,0x80,0x24,0xa2,0x43,0x20,0x24,0x22,0x43,0x02,0x60,0x03,0x4b,
|
||||
0x83,0x60,0x06,0xe0,0x00,0x20,0x00,0x00,0x20,0xc5,0x28,0xd9,0x00,0x04,0x00,0x00,
|
||||
0x00,0x00,0x00,0xbe,
|
||||
81
contrib/loaders/watchdog/armv7m_kinetis_wdog32.s
Normal file
81
contrib/loaders/watchdog/armv7m_kinetis_wdog32.s
Normal file
@@ -0,0 +1,81 @@
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2017 Tomas Vanek *
|
||||
* vanekt@fbl.cz *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc. *
|
||||
***************************************************************************/
|
||||
|
||||
/*
|
||||
Disable watchdog, 32-bit version for newer Kinetis
|
||||
Parameters:
|
||||
r0 ... WDOG32 base (in)
|
||||
|
||||
Used instruction set should work on both Cortex-M4 and M0+
|
||||
*/
|
||||
|
||||
.text
|
||||
.syntax unified
|
||||
.cpu cortex-m0
|
||||
.thumb
|
||||
|
||||
/* WDOG registers offsets */
|
||||
WDOG_CS = 0
|
||||
WDOG_CNT = 4
|
||||
WDOG_TOVAL = 8
|
||||
|
||||
WDOG_KEY = 0xd928c520
|
||||
|
||||
.thumb_func
|
||||
start:
|
||||
/* test WDOG_CS bit CMD32EN */
|
||||
ldr r2, [r0, WDOG_CS]
|
||||
ldr r3, =0x2000
|
||||
tst r2, r3
|
||||
ldr r3, =WDOG_KEY
|
||||
beq cmd16
|
||||
|
||||
/* WDOG_CNT = key */
|
||||
str r3, [r0, WDOG_CNT]
|
||||
b unlocked
|
||||
|
||||
cmd16:
|
||||
/* WDOG_CNT = key, halfword by halfword */
|
||||
strh r3, [r0, WDOG_CNT]
|
||||
lsrs r3, r3, #16
|
||||
strh r3, [r0, WDOG_CNT]
|
||||
|
||||
/* WDOG_CS: clear EN bit 7, set UPDATE bit 5 */
|
||||
unlocked:
|
||||
movs r4, #0x80
|
||||
bics r2, r4
|
||||
movs r4, #0x20
|
||||
orrs r2, r4
|
||||
str r2, [r0, WDOG_CS]
|
||||
/* All active WDOG registers have to be updated, set dummy timeout */
|
||||
/* WDOG_TOVAL = 0x400 */
|
||||
ldr r3, =0x400
|
||||
str r3, [r0, WDOG_TOVAL]
|
||||
/* OpenOCD checks exit point address. Jump to the very end. */
|
||||
b done
|
||||
|
||||
.pool
|
||||
|
||||
/* Avoid padding at .text segment end. Otherwise exit point check fails. */
|
||||
.skip ( . - start + 2) & 2, 0
|
||||
done:
|
||||
bkpt #0
|
||||
|
||||
.end
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -37,7 +37,8 @@ flash bank $_FLASHNAME kinetis 0 0 0 0 $_TARGETNAME
|
||||
kinetis create_banks
|
||||
|
||||
# Table 5-1. Clock Summary of KL25 Sub-Family Reference Manual
|
||||
# specifies up to 1MHz for VLPR mode.
|
||||
# specifies up to 1MHz for VLPR mode and up to 24MHz for run mode;
|
||||
# Table 17 of Sub-Family Data Sheet rev4 lists 25MHz as the maximum frequency.
|
||||
adapter_khz 1000
|
||||
|
||||
reset_config srst_nogate
|
||||
@@ -53,10 +54,9 @@ if {![using_hla]} {
|
||||
cortex_m reset_config sysresetreq
|
||||
}
|
||||
|
||||
# Table 5-1. Clock Summary of KL25 Sub-Family Reference Manual
|
||||
# specifies up to 24MHz for run mode; Table 17 of Sub-Family Data
|
||||
# Sheet rev4 lists 25MHz as the maximum frequency.
|
||||
# Uncoment only if VLPR mode is not used
|
||||
#$_TARGETNAME configure -event reset-init {
|
||||
# adapter_khz 24000
|
||||
#}
|
||||
# Disable watchdog not to disturb OpenOCD algorithms running on MCU
|
||||
# (e.g. armv7m_checksum_memory() in verify_image)
|
||||
# Flash driver also disables watchdog before FTFA flash programming.
|
||||
$_TARGETNAME configure -event reset-init {
|
||||
kinetis disable_wdog
|
||||
}
|
||||
|
||||
@@ -54,3 +54,11 @@ if {![using_hla]} {
|
||||
# perform a soft reset
|
||||
cortex_m reset_config sysresetreq
|
||||
}
|
||||
|
||||
# Disable watchdog not to disturb OpenOCD algorithms running on MCU
|
||||
# (e.g. armv7m_checksum_memory() in verify_image)
|
||||
# Flash driver also disables watchdog before FTFA flash programming.
|
||||
$_TARGETNAME configure -event reset-init {
|
||||
kinetis disable_wdog
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user