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

Merge pull request #16121 from fjmolinas/pr_programmer_pyocd_wrapper

Browse Source 
makefiles/tools/programmer: do not use wrapper with pyocd
This commit is contained in:
Alexandre Abadie 2021-03-02 16:43:07 +01:00 committed by GitHub
commit 9458f18f1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
makefiles/tools/programmer.inc.mk
View File

@ -5,10 +5,21 @@ ifeq (0,$(PROGRAMMER_QUIET))
PROGRAMMER_VERBOSE_OPT ?= --verbose
endif
# When multiple debuggers are connected then pyocd shows an interactive
# UI to select the user interface to flash, with the python wrapper this
# is lost and will also cause the wrapper to hang waiting for user input.
# As long as a similar functionality is not provided by the wrapper
# then disable it for pyocd.
PROGRAMMER_WRAPPER_BLACKLIST ?= pyocd
# Don't use the programmer wrapper for the CI (where speed and verbose output
# are important)
ifneq (1,$(RIOT_CI_BUILD))
USE_PROGRAMMER_WRAPPER_SCRIPT ?= 1
ifneq (,$(filter $(PROGRAMMER),$(PROGRAMMER_WRAPPER_BLACKLIST)))
USE_PROGRAMMER_WRAPPER_SCRIPT ?= 0
else
USE_PROGRAMMER_WRAPPER_SCRIPT ?= 1
endif
else
USE_PROGRAMMER_WRAPPER_SCRIPT ?= 0
endif