From fffe8e672572da46046b12a5d6b037057059393e Mon Sep 17 00:00:00 2001
From: Tomas Vanek <vanekt@fbl.cz>
Date: Fri, 2 Dec 2016 18:09:27 +0100
Subject: [PATCH] tcl/target: make sure kex.cfg is not used for Kinetis KE1x
families
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Config file renamed to ke0x.cfg and a notice added to texi.
While on ke0x.cfg CPUTAPID setting fixed: device has SWD port only, no JTAG.
Removed per device configs as they set CHIPNAME and nothing more.
Let's use reasonably universal chip name 'ke' set in family config.
Change-Id: I313db87a59f25f968eb3c27df155780b67becee8
Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/3897
Tested-by: jenkins
Reviewed-by: Ivan Meleca <ivan@artekit.eu>
Reviewed-by: Joakim Nohlgård <joakim.nohlgard@eistec.se>
Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
---
doc/openocd.texi | 5 +++--
tcl/target/ke02.cfg | 6 ------
tcl/target/ke04.cfg | 6 ------
tcl/target/ke06.cfg | 6 ------
tcl/target/{kex.cfg => ke0x.cfg} | 8 ++------
5 files changed, 5 insertions(+), 26 deletions(-)
delete mode 100644 tcl/target/ke02.cfg
delete mode 100644 tcl/target/ke04.cfg
delete mode 100644 tcl/target/ke06.cfg
rename tcl/target/{kex.cfg => ke0x.cfg} (90%)
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 24d4a8994..ac09db5e2 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -5448,10 +5448,11 @@ Command disables watchdog timer.
@deffn {Flash Driver} kinetis_ke
@cindex kinetis_ke
-KE members of the Kinetis microcontroller family from Freescale include
+KE0x members of the Kinetis microcontroller family from Freescale include
internal flash and use ARM Cortex-M0+. The driver automatically recognizes
-the KE family and sub-family using the chip identification register, and
+the KE0x sub-family using the chip identification register, and
autoconfigures itself.
+Use kinetis (not kinetis_ke) driver for KE1x devices.
@example
flash bank $_FLASHNAME kinetis_ke 0 0 0 0 $_TARGETNAME
diff --git a/tcl/target/ke02.cfg b/tcl/target/ke02.cfg
deleted file mode 100644
index 8311920ad..000000000
--- a/tcl/target/ke02.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Freescale Kinetis KE02 devices
-#
-
-set CHIPNAME ke02
-source [find target/kex.cfg]
diff --git a/tcl/target/ke04.cfg b/tcl/target/ke04.cfg
deleted file mode 100644
index f63d77c5e..000000000
--- a/tcl/target/ke04.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Freescale Kinetis KE04 devices
-#
-
-set CHIPNAME ke04
-source [find target/kex.cfg]
diff --git a/tcl/target/ke06.cfg b/tcl/target/ke06.cfg
deleted file mode 100644
index 3465b8b33..000000000
--- a/tcl/target/ke06.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Freescale Kinetis KE06 devices
-#
-
-set CHIPNAME ke06
-source [find target/kex.cfg]
diff --git a/tcl/target/kex.cfg b/tcl/target/ke0x.cfg
similarity index 90%
rename from tcl/target/kex.cfg
rename to tcl/target/ke0x.cfg
index dca8a35ab..7927e0ae0 100644
--- a/tcl/target/kex.cfg
+++ b/tcl/target/ke0x.cfg
@@ -1,5 +1,5 @@
#
-# Freescale Kinetis KE series devices
+# Freescale Kinetis KE0x series devices
#
source [find target/swj-dp.tcl]
@@ -21,11 +21,7 @@ if { [info exists WORKAREASIZE] } {
if { [info exists CPUTAPID] } {
set _CPUTAPID $CPUTAPID
} else {
- if { [using_jtag] } {
- set _CPUTAPID 0x4ba00477
- } {
- set _CPUTAPID 0x2ba01477
- }
+ set _CPUTAPID 0x0bc11477
}
swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
--
GitLab