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

make: namespace openocd DEBUG_ADAPTER variable

Browse Source
This commit is contained in:
Alexandre Abadie 2021-02-18 17:15:55 +01:00
parent 70d746dfc1
commit 603186f913
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
50 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/airfy-beacon/Makefile.include
View File

@ -3,7 +3,7 @@ PORT_LINUX ?= /dev/ttyUSB0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
# this board uses an ST-Link v2 debug adapter
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
STLINK_VERSION ?= 2
PROGRAMMER = openocd

2
boards/b-l072z-lrwan1/Makefile.include
View File

@ -3,7 +3,7 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
# this board has an on-board ST-link adapter
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
# this board can become un-flashable after a hardfault,
# use connect_assert_srst to always be able to flash or reset the board.

2
boards/b-l475e-iot01a/Makefile.include
View File

@ -3,7 +3,7 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
# this board has an on-board ST-link adapter
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
# The board can become un-flashable after some execution,
# use connect_assert_srst to always be able to flash or reset the board.

2
boards/calliope-mini/Makefile.include
View File

@ -2,7 +2,7 @@
PROGRAMMER ?= openocd
ifeq (openocd,$(PROGRAMMER))
DEBUG_ADAPTER = dap
OPENOCD_DEBUG_ADAPTER = dap
else ifeq (pyocd,$(PROGRAMMER))
# PyOCD doesn't recognize automatically the board ID, so target type has to
# be passed explicitly

2
boards/common/e104-bt50xxa-tb/Makefile.include
View File

@ -1,5 +1,5 @@
# external programmer required
DEBUG_ADAPTER ?= jlink
OPENOCD_DEBUG_ADAPTER ?= jlink
INCLUDES += -I$(RIOTBOARD)/common/e104-bt50xxa-tb/include

4
boards/common/frdm/Makefile.include
View File

@ -3,8 +3,8 @@ PROGRAMMER ?= openocd
# Use the shared OpenOCD configuration
# Using dap or jlink depends on which firmware the OpenSDA debugger is running
DEBUG_ADAPTER ?= dap
#DEBUG_ADAPTER ?= jlink
OPENOCD_DEBUG_ADAPTER ?= dap
#OPENOCD_DEBUG_ADAPTER ?= jlink
# Configuration for OpenOCD v0.10.0 and newer
# For KW41Z, an OpenOCD version built from source is required. The support for

2
boards/common/iotlab/Makefile.include
View File

@ -11,7 +11,7 @@ PROGRAMMER ?= openocd
# Using connect_assert_srst removes errors on flash from invalid state
OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1
DEBUG_ADAPTER ?= iotlab
OPENOCD_DEBUG_ADAPTER ?= iotlab
OPENOCD_CONFIG ?= $(RIOTBOARD)/common/iotlab/dist/openocd.cfg

2
boards/common/kw41z/Makefile.include
View File

@ -2,7 +2,7 @@
INCLUDES += -I$(RIOTBOARD)/common/kw41z/include
# This board comes with OpenSDA configured for JLink compatibility
DEBUG_ADAPTER ?= jlink
OPENOCD_DEBUG_ADAPTER ?= jlink
# Include default FRDM board config
include $(RIOTBOARD)/common/frdm/Makefile.include

2
boards/common/nrf52/Makefile.include
View File

@ -20,6 +20,6 @@ else ifeq (openocd,$(PROGRAMMER))
# setup OpenOCD for flashing. Version 0.10 of OpenOCD doesn't contain support
# for nrf52dk and nrf52840dk boards. To use OpenOCD with these a version
# build from source (master > 2018, August the 13rd) is required.
DEBUG_ADAPTER ?= jlink
OPENOCD_DEBUG_ADAPTER ?= jlink
OPENOCD_CONFIG = $(RIOTBOARD)/common/nrf52/dist/openocd.cfg
endif

2
boards/common/nrf52/doc.txt
View File

@ -28,7 +28,7 @@ To flash the board with OpenOCD, use the `PROGRAMMER` variable:
It is also possible to use the SWD interface of a ST-LINK/V2 in-circuit
debugger/programmer with OpenOCD to flash a nrf52 board:
```
PROGRAMMER=openocd DEBUG_ADAPTER=stlink make BOARD=<nrf52 board> -C examples/hello-world flash
PROGRAMMER=openocd OPENOCD_DEBUG_ADAPTER=stlink make BOARD=<nrf52 board> -C examples/hello-world flash
```
*/

2
boards/common/particle-mesh/Makefile.include
View File

@ -28,7 +28,7 @@ else
# option is passed explicitly
FLASH_TARGET_TYPE ?= -t nrf52840
else ifeq (openocd,$(PROGRAMMER))
DEBUG_ADAPTER ?= dap
OPENOCD_DEBUG_ADAPTER ?= dap
endif
endif

4
boards/common/qn908x/Makefile.include
View File

@ -4,8 +4,8 @@
PROGRAMMER ?= openocd
# Using dap or jlink depends on which firmware the OpenSDA debugger is running
#DEBUG_ADAPTER ?= dap
DEBUG_ADAPTER ?= jlink
#OPENOCD_DEBUG_ADAPTER ?= dap
OPENOCD_DEBUG_ADAPTER ?= jlink
# Use the shared OpenOCD configuration
OPENOCD_CONFIG ?= $(RIOTBOARD)/common/qn908x/dist/openocd.cfg

2
boards/frdm-kl43z/Makefile.include
View File

@ -2,7 +2,7 @@
# which we do not have any support for. Update your OpenSDA firmware with
# the latest CMSIS-DAP firmware for your board from
# https://www.nxp.com/support/developer-resources/run-time-software/kinetis-developer-resources/ides-for-kinetis-mcus/opensda-serial-and-debug-adapter:OPENSDA
DEBUG_ADAPTER ?= dap
OPENOCD_DEBUG_ADAPTER ?= dap
# Include default FRDM board config
include $(RIOTBOARD)/common/frdm/Makefile.include

2
boards/hifive1b/Makefile.include
View File

@ -2,7 +2,7 @@
PROGRAMMER ?= jlink
ifeq (openocd,$(PROGRAMMER))
DEBUG_ADAPTER = jlink
OPENOCD_DEBUG_ADAPTER = jlink
OPENOCD_TRANSPORT = jtag
OPENOCD_PRE_FLASH_CMDS += "-c flash protect 0 1 last off"
else ifeq (jlink,$(PROGRAMMER))

2
boards/i-nucleo-lrwan1/Makefile.include
View File

@ -2,7 +2,7 @@
INCLUDES += -I$(RIOTBOARD)/common/stm32/include
# to flash this board, use an ST-link adapter
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
# this board can become un-flashable after a hardfault,
# use connect_assert_srst to always be able to flash or reset the boards.

2
boards/im880b/Makefile.include
View File

@ -10,4 +10,4 @@ CFLAGS+=-DSX127X_RX_SWITCH
# this board uses openocd
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink

2
boards/limifrog-v1/Makefile.include
View File

@ -7,5 +7,5 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
# this board uses openocd with st-link
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
STLINK_VERSION ?= 2

2
boards/lsn50/Makefile.include
View File

@ -7,4 +7,4 @@ PROGRAMMER ?= openocd
# use connect_assert_srst to always be able to flash or reset the boards.
OPENOCD_RESET_USE_CONNECT_ASSERT_SRST ?= 1
# By default, flash this board using an ST-link adapter
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink

2
boards/maple-mini/Makefile.include
View File

@ -3,4 +3,4 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
# this board uses openocd with st-link
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink

2
boards/mcb2388/Makefile.include
View File

@ -1,5 +1,5 @@
# FLASHER will be lpc2k_pgm still
DEBUG_ADAPTER ?= dap
OPENOCD_DEBUG_ADAPTER ?= dap
JLINK_DEVICE := LPC2388
OPENOCD_TRANSPORT := jtag

2
boards/microbit-v2/Makefile.include
View File

@ -5,7 +5,7 @@ ifeq (pyocd,$(PROGRAMMER))
# option is passed explicitly
FLASH_TARGET_TYPE ?= -t $(CPU)
else ifeq (openocd,$(PROGRAMMER))
DEBUG_ADAPTER = dap
OPENOCD_DEBUG_ADAPTER = dap
endif
ifneq (,$(filter microbit,$(USEMODULE)))

2
boards/microbit/Makefile.include
View File

@ -5,7 +5,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
PROGRAMMER ?= openocd
ifeq (openocd,$(PROGRAMMER))
DEBUG_ADAPTER = dap
OPENOCD_DEBUG_ADAPTER = dap
endif
# QEMU 4.0 added microbit system emulation.

2
boards/msbiot/Makefile.include
View File

@ -3,7 +3,7 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
ifeq (openocd,$(PROGRAMMER))
STLINK_VERSION ?= 2
PORT_LINUX ?= /dev/ttyUSB0

2
boards/mulle/Makefile.include
View File

@ -7,7 +7,7 @@ endif
PROGRAMMER ?= openocd
# Default debug adapter choice is to use the Mulle programmer board
DEBUG_ADAPTER ?= mulle
OPENOCD_DEBUG_ADAPTER ?= mulle
# We need special handling of the watchdog if we want to speed up the flash
# verification by using the MCU to compute the image checksum after flashing.

2
boards/nrf51dk/Makefile.include
View File

@ -6,7 +6,7 @@ PROGRAMMER ?= openocd
# dap debug adapter is required for openocd
ifeq (openocd,$(PROGRAMMER))
DEBUG_ADAPTER = dap
OPENOCD_DEBUG_ADAPTER = dap
endif
# include nrf51 boards common configuration

2
boards/nrf51dongle/Makefile.include
View File

@ -6,7 +6,7 @@ PROGRAMMER ?= jlink
# set required jlink debug adapter for openocd if it's used
ifeq (openocd,$(PROGRAMMER))
DEBUG_ADAPTER = jlink
OPENOCD_DEBUG_ADAPTER = jlink
endif
# include nrf51 boards common configuration

2
boards/nrf52832-mdk/Makefile.include
View File

@ -8,7 +8,7 @@ ifeq (pyocd,$(PROGRAMMER))
# option is passed explicitly
FLASH_TARGET_TYPE ?= -t $(CPU)
else ifeq (openocd,$(PROGRAMMER))
DEBUG_ADAPTER = dap
OPENOCD_DEBUG_ADAPTER = dap
endif
include $(RIOTBOARD)/common/nrf52/Makefile.include

2
boards/nrf52840-mdk/Makefile.include
View File

@ -8,7 +8,7 @@ ifeq (pyocd,$(PROGRAMMER))
# option is passed explicitly
FLASH_TARGET_TYPE ?= -t nrf52840
else ifeq (openocd,$(PROGRAMMER))
DEBUG_ADAPTER = dap
OPENOCD_DEBUG_ADAPTER = dap
endif
include $(RIOTBOARD)/common/nrf52/Makefile.include

2
boards/nrf6310/Makefile.include
View File

@ -7,7 +7,7 @@ PROGRAMMER ?= jlink
# set required debug adapter for openocd if it's used
ifeq (openocd,$(PROGRAMMER))
DEBUG_ADAPTER = jlink
OPENOCD_DEBUG_ADAPTER = jlink
endif
# include nrf51 boards common configuration

4
boards/openlabs-kw41z-mini/Makefile.include
View File

@ -7,8 +7,8 @@ SLOT1_LEN ?= $(SLOT0_LEN)
# support SWD and UART via Pi GPIO header
PORT_LINUX ?= /dev/serial0
# TODO change to bcm2835gpio after it's merged as it's faster
# DEBUG_ADAPTER ?= bcm2835gpio
DEBUG_ADAPTER ?= sysfs_gpio
# OPENOCD_DEBUG_ADAPTER ?= bcm2835gpio
OPENOCD_DEBUG_ADAPTER ?= sysfs_gpio
SRST_PIN ?= 16
SWCLK_PIN ?= 20
SWDIO_PIN ?= 21

2
boards/p-l496g-cell02/Makefile.include
View File

@ -3,4 +3,4 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
# this board uses openocd with st-link
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink

2
boards/pba-d-01-kw2x/Makefile.include
View File

@ -23,7 +23,7 @@ OPENOCD_PRE_VERIFY_CMDS += \
-c 'resume 0x20000000'
PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield.sh
DEBUG_ADAPTER ?= dap
OPENOCD_DEBUG_ADAPTER ?= dap
# The board can become un-flashable after some firmware, use connect_assert_srst
# to always be able to flash or reset the board.

2
boards/phynode-kw41z/Makefile.include
View File

@ -3,7 +3,7 @@ PROGRAMMER ?= openocd
# dap debug adapter is required for openocd
ifeq (openocd,$(PROGRAMMER))
DEBUG_ADAPTER = dap
OPENOCD_DEBUG_ADAPTER = dap
endif
# Enable direct write to FCF (required for setting FOPT byte).

2
boards/reel/Makefile.include
View File

@ -1,5 +1,5 @@
# set programming environment
DEBUG_ADAPTER ?= dap
OPENOCD_DEBUG_ADAPTER ?= dap
PROGRAMMER ?= openocd
# use the common nrf52 config for the rest

2
boards/seeeduino_arch-pro/Makefile.include
View File

@ -5,7 +5,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
# this board uses openocd with an HEXFILE
PROGRAMMER ?= openocd
FLASHFILE ?= $(HEXFILE)
DEBUG_ADAPTER ?= dap
OPENOCD_DEBUG_ADAPTER ?= dap
# generate image checksum from hex file
PRE_FLASH_CHECK_SCRIPT = lpc_checksum --format hex

2
boards/stm32f0discovery/Makefile.include
View File

@ -7,5 +7,5 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
# this board uses openocd
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
STLINK_VERSION ?= 2

2
boards/stm32f3discovery/Makefile.include
View File

@ -7,7 +7,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
# this board uses openocd
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
STLINK_VERSION ?= 2
# The board can become un-flashable after some execution,

2
boards/stm32f429i-disc1/Makefile.include
View File

@ -4,4 +4,4 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
# this board uses openocd
PROGRAMMER ?= openocd
# this board has an on-board ST-link adapter
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink

2
boards/stm32f4discovery/Makefile.include
View File

@ -7,7 +7,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
# this board uses openocd with st-link
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
STLINK_VERSION ?= 2
# Tell renode on which UART stdio is available

2
boards/stm32f723e-disco/Makefile.include
View File

@ -5,4 +5,4 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
PROGRAMMER ?= openocd
# this board has an on-board ST-link adapter
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink

2
boards/stm32f769i-disco/Makefile.include
View File

@ -5,4 +5,4 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
PROGRAMMER ?= openocd
# this board has an on-board ST-link adapter
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink

2
boards/stm32l0538-disco/Makefile.include
View File

@ -8,4 +8,4 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
# this board uses openocd with st-link
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink

2
boards/stm32l476g-disco/Makefile.include
View File

@ -3,7 +3,7 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
# this board uses openocd with st-link
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
# This board can become un-flashable after a hardfault,
# use connect_assert_srst to always be able to flash or reset the board.

2
boards/stm32mp157c-dk2/Makefile.include
View File

@ -2,7 +2,7 @@
INCLUDES += -I$(RIOTBOARD)/common/stm32/include
# this board has an on-board ST-link adapter
DEBUG_ADAPTER = stlink-dap
OPENOCD_DEBUG_ADAPTER = stlink-dap
OPENOCD_CORE = stm32mp15x.cm4
GDB_PORT_CORE_OFFSET = 1

2
boards/ublox-c030-u201/Makefile.include
View File

@ -4,5 +4,5 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
# this board uses openocd with st-link
PROGRAMMER ?= openocd
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
STLINK_VERSION ?= 2-1

2
boards/yunjia-nrf51822/Makefile.include
View File

@ -3,7 +3,7 @@ PORT_LINUX ?= /dev/ttyUSB0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
# This board uses an ST-Link v2 debug adapter
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
STLINK_VERSION ?= 2
# import nrf51 boards common configuration

2
dist/tools/buildsystem_sanity_check/check.sh vendored
View File

@ -108,7 +108,7 @@ UNEXPORTED_VARIABLES+=('RESET' 'RESETFLAGS')
UNEXPORTED_VARIABLES+=('DEBUGGER' 'DEBUGGER_FLAGS')
UNEXPORTED_VARIABLES+=('DEBUGSERVER' 'DEBUGSERVER_FLAGS')
UNEXPORTED_VARIABLES+=('PREFLASHER' 'PREFFLAGS' 'FLASHDEPS')
UNEXPORTED_VARIABLES+=('DEBUG_ADAPTER' 'DEBUG_ADAPTER_ID')
UNEXPORTED_VARIABLES+=('OPENOCD_DEBUG_ADAPTER' 'DEBUG_ADAPTER_ID')
UNEXPORTED_VARIABLES+=('PROGRAMMER_SERIAL')
UNEXPORTED_VARIABLES+=('STLINK_VERSION')
UNEXPORTED_VARIABLES+=('PORT_LINUX' 'PORT_DARWIN')

6
makefiles/boards/sam0.inc.mk
View File

@ -16,15 +16,15 @@ ifneq (,$(filter debug% flash% %term test,$(MAKECMDGOALS)))
endif
# Default for these boards is to use a CMSIS-DAP programmer
DEBUG_ADAPTER ?= dap
OPENOCD_DEBUG_ADAPTER ?= dap
# If no programmer is set, select a default programmer
ifeq ($(PROGRAMMER),)
# EDBG can only be used with a compatible Atmel programmer
ifeq ($(DEBUG_ADAPTER),dap)
ifeq ($(OPENOCD_DEBUG_ADAPTER),dap)
# set this to either openocd, jlink or edbg
PROGRAMMER ?= edbg
else ifeq ($(DEBUG_ADAPTER),jlink)
else ifeq ($(OPENOCD_DEBUG_ADAPTER),jlink)
# only use JLinkExe if it's installed
ifneq (,$(shell which JLinkExe))
PROGRAMMER ?= jlink

2
makefiles/boards/stm32.inc.mk
View File

@ -20,7 +20,7 @@ ifeq (openocd,$(PROGRAMMER))
# For STM32 boards the ST-link adapter is the default adapter, e.g. all
# Nucleo boards have an on-board ST-link adapter
DEBUG_ADAPTER ?= stlink
OPENOCD_DEBUG_ADAPTER ?= stlink
endif
ifeq (jlink,$(PROGRAMMER))

4
makefiles/tools/openocd.inc.mk
View File

@ -9,8 +9,8 @@ DEBUGGER_FLAGS ?= debug $(ELFFILE)
DEBUGSERVER_FLAGS ?= debug-server
RESET_FLAGS ?= reset
ifneq (,$(DEBUG_ADAPTER))
include $(RIOTMAKE)/tools/openocd-adapters/$(DEBUG_ADAPTER).inc.mk
ifneq (,$(OPENOCD_DEBUG_ADAPTER))
include $(RIOTMAKE)/tools/openocd-adapters/$(OPENOCD_DEBUG_ADAPTER).inc.mk
OPENOCD_ADAPTER_INIT += -c 'transport select $(OPENOCD_TRANSPORT)'
endif