riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

boards/mulle: remove simple expansion of PORT

Browse Source
This commit is contained in:
Francisco Molina 2019-10-17 09:18:14 +02:00
parent 8a877b58df
commit 0e672da1e4
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
boards/mulle/Makefile.include
View File

@ -5,33 +5,13 @@ endif
# Default debug adapter choice is to use the Mulle programmer board # Default debug adapter choice is to use the Mulle programmer board
DEBUG_ADAPTER ?= mulle DEBUG_ADAPTER ?= mulle
# Host OS name
OS := $(shell uname)
# Fall back to PROGRAMMER_SERIAL for backwards compatibility # Fall back to PROGRAMMER_SERIAL for backwards compatibility
DEBUG_ADAPTER_ID ?= $(PROGRAMMER_SERIAL) DEBUG_ADAPTER_ID ?= $(PROGRAMMER_SERIAL)
ifeq ($(PORT),) # Define the default port depending on the host OS
# try to find tty name by serial number, only works on Linux currently. PORT_LINUX ?= /dev/ttyUSB0
ifeq ($(OS),Linux) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*)))
ifneq ($(DEBUG_ADAPTER_ID),)
PORT := $(firstword $(shell $(RIOTTOOLS)/usb-serial/find-tty.sh '^$(DEBUG_ADAPTER_ID)$$'))
else
# find-tty.sh will return the first USB tty if no serial is given.
PORT := $(firstword $(shell $(RIOTTOOLS)/usb-serial/find-tty.sh))
endif
else ifeq ($(OS),Darwin)
ifneq ($(DEBUG_ADAPTER_ID),)
PORT := /dev/tty.usbserial-$(DEBUG_ADAPTER_ID)B
else
PORT := $(firstword $(sort $(wildcard /dev/tty.usbserial*)))
endif
endif
endif
ifeq ($(PORT),)
# fall back to a sensible default
PORT := /dev/ttyUSB0
endif
# We need special handling of the watchdog if we want to speed up the flash # 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. # verification by using the MCU to compute the image checksum after flashing.