1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

boards/mulle: fix OpenOCD config

- use JTAG instead of SWD to restore old behavior
- replace deprecated configuration names with new ones
This commit is contained in:
Marian Buschsieweke 2024-05-01 18:57:38 +02:00
parent d1167d9d77
commit 0fd649de67
No known key found for this signature in database
GPG Key ID: 77AA882EC78084E6
3 changed files with 17 additions and 16 deletions

View File

@ -6,6 +6,7 @@ endif
# this board uses openocd
PROGRAMMER ?= openocd
PROGRAMMERS_SUPPORTED += openocd
OPENOCD_TRANSPORT := jtag
# Default debug adapter choice is to use the Mulle programmer board
OPENOCD_DEBUG_ADAPTER ?= mulle

View File

@ -6,23 +6,23 @@
#
# Reduce this if you are having problems with losing connection to the Mulle
adapter_khz 1000
adapter speed 1000
# JTAG interface configuration
interface ftdi
adapter driver ftdi
ftdi_device_desc "Mulle Programmer v0.60"
ftdi_vid_pid 0x0403 0x6010
ftdi_channel 1
ftdi_layout_init 0x0008 0x005b
ftdi channel 1
ftdi layout_init 0x0008 0x005b
# These are the pins that are used for SRST and TRST. Note that the Mulle
# programming board inverts the reset signal between the FTDI chip and the MCU,
# so we need to use -ndata here to tell OpenOCD that the signals are active HIGH.
ftdi_layout_signal nTRST -ndata 0x0010
ftdi_layout_signal nSRST -ndata 0x0040
ftdi layout_signal nTRST -ndata 0x0010
ftdi layout_signal nSRST -ndata 0x0040
# In the eyes of OpenOCD, the reset signal is push-pull, because of the hardware
# design however, it is actually open drain.
reset_config srst_push_pull
reset_config srst_push_pull srst_gates_jtag

View File

@ -6,22 +6,22 @@
#
# Reduce this if you are having problems with losing connection to the Mulle
adapter_khz 1000
adapter speed 1000
# JTAG interface configuration
interface ftdi
ftdi_device_desc "Mulle Programmer v0.70"
ftdi_vid_pid 0x0403 0x6010
adapter driver ftdi
ftdi device_desc "Mulle Programmer v0.70"
ftdi vid_pid 0x0403 0x6010
ftdi_channel 1
ftdi_layout_init 0x0008 0x005b
ftdi channel 1
ftdi layout_init 0x0008 0x005b
# These are the pins that are used for SRST and TRST. Active low on programmer
# boards v0.70 and up (used to be active high on v0.60)
ftdi_layout_signal nTRST -data 0x0010
ftdi_layout_signal nSRST -data 0x0040
ftdi layout_signal nTRST -data 0x0010
ftdi layout_signal nSRST -data 0x0040
# In the eyes of OpenOCD, the reset signal is push-pull, because of the hardware
# design however, it is actually open drain.
reset_config srst_push_pull
reset_config srst_push_pull srst_gates_jtag