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

makefiles/tools: remove useless export when setting DEBUG_ADAPTER_ID

Browse Source
This commit is contained in:
Alexandre Abadie 2019-05-31 11:45:23 +02:00
parent 6ecc16dd5d
commit 79a2db89e0
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
PORT_LINUX ?= /dev/ttyACM0 PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
# Use DEBUG_ADAPTER_ID to specify the programmer serial number to use: # Use DEBUG_ADAPTER_ID to specify the programmer serial number to use:
# export DEBUG_ADAPTER_ID="ATML..." # DEBUG_ADAPTER_ID="ATML..."
# The SERIAL setting is only available for backwards compatibility with older # The SERIAL setting is only available for backwards compatibility with older
# settings. # settings.
@ -13,7 +13,7 @@ ifneq (,$(SERIAL))
$(error Did not find a device with serial $(SERIAL)) $(error Did not find a device with serial $(SERIAL))
endif endif
PORT_LINUX := $(SERIAL_TTY) PORT_LINUX := $(SERIAL_TTY)
export DEBUG_ADAPTER_ID ?= $(SERIAL) DEBUG_ADAPTER_ID ?= $(SERIAL)
endif endif
# setup serial terminal # setup serial terminal

2
makefiles/tools/edbg.inc.mk
View File

@ -5,7 +5,7 @@ FLASHFILE ?= $(BINFILE)
# Use USB serial number to select device when more than one is connected # Use USB serial number to select device when more than one is connected
# 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: # Usage:
# export DEBUG_ADAPTER_ID="ATML..." # DEBUG_ADAPTER_ID="ATML..."
# BOARD=<board> make flash # BOARD=<board> make flash
ifneq (,$(DEBUG_ADAPTER_ID)) ifneq (,$(DEBUG_ADAPTER_ID))
EDBG_ARGS += --serial $(DEBUG_ADAPTER_ID) EDBG_ARGS += --serial $(DEBUG_ADAPTER_ID)

2
makefiles/tools/openocd-adapters/mulle.inc.mk
View File

@ -3,7 +3,7 @@
# programmer board serial number. # programmer board serial number.
# Fall back to PROGRAMMER_SERIAL for backwards compatibility # Fall back to PROGRAMMER_SERIAL for backwards compatibility
export DEBUG_ADAPTER_ID ?= $(PROGRAMMER_SERIAL) DEBUG_ADAPTER_ID ?= $(PROGRAMMER_SERIAL)
ifneq (,$(DEBUG_ADAPTER_ID)) ifneq (,$(DEBUG_ADAPTER_ID))
# Makefile-way of comparing numbers, using lexicographical sorting since we # Makefile-way of comparing numbers, using lexicographical sorting since we