tcl/target: make sure kex.cfg is not used for Kinetis KE1x families

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>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 24d4a8994786ee13ca478d26b69185c9d5438814..ac09db5e2ca9cee46c28d80a16a75b0d0d651d4a 100644 (file)
--- 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 (file)
index 8311920..0000000
--- 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 (file)
index f63d77c..0000000
--- 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 (file)
index 3465b8b..0000000
--- 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/ke0x.cfg b/tcl/target/ke0x.cfg
new file mode 100644 (file)
index 0000000..7927e0a
--- /dev/null
+++ b/tcl/target/ke0x.cfg
@@ -0,0 +1,54 @@
+#
+# Freescale Kinetis KE0x series devices
+#
+
+source [find target/swj-dp.tcl]
+
+if { [info exists CHIPNAME] } {
+    set _CHIPNAME $CHIPNAME
+} else {
+    set _CHIPNAME ke
+}
+
+# Work-area is a space in RAM used for flash programming
+# By default use 1kB
+if { [info exists WORKAREASIZE] } {
+   set _WORKAREASIZE $WORKAREASIZE
+} else {
+   set _WORKAREASIZE 0x400
+}
+
+if { [info exists CPUTAPID] } {
+    set _CPUTAPID $CPUTAPID
+} else {
+   set _CPUTAPID 0x0bc11477
+}
+
+swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
+
+set _TARGETNAME $_CHIPNAME.cpu
+target create $_TARGETNAME cortex_m -chain-position $_CHIPNAME.cpu
+
+$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
+
+set _FLASHNAME $_CHIPNAME.flash
+flash bank $_FLASHNAME kinetis_ke 0 0 0 0 $_TARGETNAME
+
+adapter_khz 1000
+
+reset_config srst_nogate
+
+if {![using_hla]} {
+
+   # It is important that "kinetis_ke mdm check_security" is called for
+   # 'examine-end' event and not 'eximine-start'. Calling it in 'examine-start'
+   # causes "kinetis_ke mdm check_security" to fail the first time openocd
+   # calls it when it tries to connect after the CPU has been power-cycled.
+   $_CHIPNAME.cpu configure -event examine-end {
+      kinetis_ke mdm check_security
+   }
+
+   # if srst is not fitted use SYSRESETREQ to
+   # perform a soft reset
+   cortex_m reset_config sysresetreq
+}

diff --git a/tcl/target/kex.cfg b/tcl/target/kex.cfg
deleted file mode 100644 (file)
index dca8a35..0000000
--- a/tcl/target/kex.cfg
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Freescale Kinetis KE series devices
-#
-
-source [find target/swj-dp.tcl]
-
-if { [info exists CHIPNAME] } {
-    set _CHIPNAME $CHIPNAME
-} else {
-    set _CHIPNAME ke
-}
-
-# Work-area is a space in RAM used for flash programming
-# By default use 1kB
-if { [info exists WORKAREASIZE] } {
-   set _WORKAREASIZE $WORKAREASIZE
-} else {
-   set _WORKAREASIZE 0x400
-}
-
-if { [info exists CPUTAPID] } {
-    set _CPUTAPID $CPUTAPID
-} else {
-   if { [using_jtag] } {
-      set _CPUTAPID 0x4ba00477
-   } {
-      set _CPUTAPID 0x2ba01477
-   }
-}
-
-swj_newdap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-
-set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME cortex_m -chain-position $_CHIPNAME.cpu
-
-$_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
-
-set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME kinetis_ke 0 0 0 0 $_TARGETNAME
-
-adapter_khz 1000
-
-reset_config srst_nogate
-
-if {![using_hla]} {
-
-   # It is important that "kinetis_ke mdm check_security" is called for
-   # 'examine-end' event and not 'eximine-start'. Calling it in 'examine-start'
-   # causes "kinetis_ke mdm check_security" to fail the first time openocd
-   # calls it when it tries to connect after the CPU has been power-cycled.
-   $_CHIPNAME.cpu configure -event examine-end {
-      kinetis_ke mdm check_security
-   }
-
-   # if srst is not fitted use SYSRESETREQ to
-   # perform a soft reset
-   cortex_m reset_config sysresetreq
-}