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

Merge pull request #4166 from x3ro/samr-multiple-boards-term

Browse Source 
Minor usability improvements prior to adding documentation
This commit is contained in:
Peter Kietzmann 2015-10-29 09:20:41 +01:00
commit a7ea2522c0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.include
View File

@ -287,6 +287,9 @@ term: $(filter flash, $(MAKECMDGOALS))
exit 1; }
$(TERMPROG) $(TERMFLAGS)
list-ttys:
$(AD)$(RIOTBASE)/dist/tools/usb-serial/list-ttys.sh
doc:
make -BC $(RIOTBASE) doc

8
boards/samr21-xpro/Makefile.include
View File

@ -16,8 +16,12 @@ include $(RIOTBOARD)/Makefile.include.serial
# Use /dist/tools/usb-serial/list-ttys.sh to find out serial number.
# Usage: SERIAL="ATML..." BOARD="samr21-xpro" make flash
ifneq (,$(SERIAL))
export OPENOCD_EXTRA_INIT += "-c cmsis_dap_serial $(SERIAL)"
PORT_LINUX := $(shell $(RIOTBASE)/dist/tools/usb-serial/find-tty.sh $(SERIAL))
export OPENOCD_EXTRA_INIT += "-c cmsis_dap_serial $(SERIAL)"
SERIAL_TTY = $(shell $(RIOTBASE)/dist/tools/usb-serial/find-tty.sh $(SERIAL))
ifeq (,$(SERIAL_TTY))
$(error Did not find a device with serial $(SERIAL))
endif
PORT_LINUX := $(SERIAL_TTY)
endif
# this board uses openocd