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

Merge pull request #12733 from fjmolinas/pr_jlink_serial

Browse Source 
makefiles/tools/jlink.inc.mk: DEBUG_ADAPTER_ID as JLINK_SERIAL
This commit is contained in:
Alexandre Abadie 2019-11-18 13:47:26 +01:00 committed by GitHub
commit 588766ab27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -658,7 +658,7 @@ term: $(TERMDEPS)
$(TERMPROG) $(TERMFLAGS)
# Term without the pyterm added logging
# TERMFLAGS must be exported for `jlink.sh term_rtt`.
# PYTERMFLAGS must be exported for `jlink.sh term-rtt`.
cleanterm: export PYTERMFLAGS += --noprefix --no-repeat-command-on-empty-line
cleanterm: $(TERMDEPS)
$(call check_cmd,$(TERMPROG),Terminal program)

2
boards/hamilton/Makefile.include
View File

@ -5,7 +5,7 @@ OFLAGS := --gap-fill 0xff
# Configure terminal, hamilton doesn't provide any UART, thus use RTT
TERMPROG = $(RIOTTOOLS)/jlink/jlink.sh
TERMFLAGS = term_rtt
TERMFLAGS = term-rtt
USEMODULE += stdio_rtt

2
boards/ruuvitag/Makefile.include
View File

@ -1,7 +1,7 @@
# for this board, we are using Segger's RTT as default terminal interface
USEMODULE += stdio_rtt
TERMPROG = $(RIOTTOOLS)/jlink/jlink.sh
TERMFLAGS = term_rtt
TERMFLAGS = term-rtt
# use shared Makefile.include
include $(RIOTBOARD)/common/nrf52xxxdk/Makefile.include

2
boards/thingy52/Makefile.include
View File

@ -1,7 +1,7 @@
# for this board, we are using Segger's RTT as default terminal interface
USEMODULE += stdio_rtt
TERMPROG = $(RIOTTOOLS)/jlink/jlink.sh
TERMFLAGS = term_rtt
TERMFLAGS = term-rtt
# use shared Makefile.include
include $(RIOTBOARD)/common/nrf52/Makefile.include

7
dist/tools/jlink/jlink.sh vendored
View File

@ -50,6 +50,9 @@
# reset: triggers a hardware reset of the target board
#
#
# term-rtt: opens a serial terminal using jlink RTT(reak time transfer)
#
#
# @author Hauke Peteresen <hauke.petersen@fu-berlin.de>
# Set IMAGE_OFFSET to zero by default.
@ -286,12 +289,12 @@ case "${ACTION}" in
echo "### Resetting Target ###"
do_reset "$@"
;;
term_rtt)
term-rtt)
echo "### Starting RTT terminal ###"
do_term
;;
*)
echo "Usage: $0 {flash|debug|debug-server|reset}"
echo "Usage: $0 {flash|debug|debug-server|reset|term-rtt}"
echo " flash <binfile>"
echo " debug <elffile>"
;;

6
makefiles/tools/jlink.inc.mk
View File

@ -9,3 +9,9 @@ FFLAGS ?= flash $(FLASHFILE)
DEBUGGER_FLAGS ?= debug $(ELFFILE)
DEBUGSERVER_FLAGS ?= debug-server
RESET_FLAGS ?= reset
JLINK_SERIAL ?= $(DEBUG_ADAPTER_ID)
# Export JLINK_SERIAL to required targets
JLINK_TARGETS = debug% flash% reset term-rtt
$(call target-export-variables,$(JLINK_TARGETS),JLINK_SERIAL)