RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #12151 from cladmi/pr/pba-d-01-kw2x/do_not_use_OPENOCD_ADAPTER_INIT

Browse Source 
boards/pba-d-01-kw2x: rely on the common adapter selection code
This commit is contained in:
Francisco 2019-09-23 11:47:50 +02:00 committed by GitHub
commit 3d2697973a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
export OPENOCD_PRE_VERIFY_CMDS += \ export OPENOCD_PRE_VERIFY_CMDS += \
-c 'load_image $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin 0x20000000 bin' \ -c 'load_image $(RIOTCPU)/$(CPU)/dist/wdog-disable.bin 0x20000000 bin' \
-c 'resume 0x20000000' -c 'resume 0x20000000'
export OPENOCD_EXTRA_INIT
export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield.sh export PRE_FLASH_CHECK_SCRIPT = $(RIOTCPU)/$(CPU)/dist/check-fcfield.sh
DEBUG_ADAPTER ?= dap DEBUG_ADAPTER ?= dap
@ -18,7 +17,8 @@ DEBUG_ADAPTER ?= dap
# Use /dist/tools/usb-serial/list-ttys.sh to find out serial number. # Use /dist/tools/usb-serial/list-ttys.sh to find out serial number.
# Usage: SERIAL="0200..." BOARD="pba-d-01-kw2x" make flash # Usage: SERIAL="0200..." BOARD="pba-d-01-kw2x" make flash
ifneq (,$(SERIAL)) ifneq (,$(SERIAL))
export OPENOCD_EXTRA_INIT += "-c cmsis_dap_serial $(SERIAL)" # Trigger adapter selection on SERIAL in 'openocd-adapters'
DEBUG_ADAPTER_ID ?= $(SERIAL)
SERIAL_TTY = $(firstword $(shell $(RIOTTOOLS)/usb-serial/find-tty.sh $(SERIAL))) SERIAL_TTY = $(firstword $(shell $(RIOTTOOLS)/usb-serial/find-tty.sh $(SERIAL)))
ifeq (,$(SERIAL_TTY)) ifeq (,$(SERIAL_TTY))
$(error Did not find a device with serial $(SERIAL)) $(error Did not find a device with serial $(SERIAL))