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

Merge pull request #11617 from cladmi/pr/uniflash/fix_empty_line_with_reset_flags

Browse Source 
makefiles/tools/uniflash.inc.mk: remove empty RESET_FLAGS
This commit is contained in:
Kevin "Bear Puncher" Weiss 2019-06-03 13:15:59 +02:00 committed by GitHub
commit 2ba303bc84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
makefiles/tools/uniflash.inc.mk
View File

@ -13,7 +13,6 @@ ifneq ("$(wildcard $(UNIFLASH_PATH)/dslite.sh)","")
_XDS110RESET ?= $(UNIFLASH_PATH)/simplelink/imagecreator/bin/xds110reset _XDS110RESET ?= $(UNIFLASH_PATH)/simplelink/imagecreator/bin/xds110reset
XDS110RESET ?= $(firstword $(wildcard $(_XDS110RESET) $(_XDS110RESET_4_0_4_3)) xds110reset) XDS110RESET ?= $(firstword $(wildcard $(_XDS110RESET) $(_XDS110RESET_4_0_4_3)) xds110reset)
RESET = $(XDS110RESET) RESET = $(XDS110RESET)
RESET_FLAGS
else else
FLASHER = $(UNIFLASH_PATH)/uniflash.sh FLASHER = $(UNIFLASH_PATH)/uniflash.sh
FFLAGS = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -program $(FLASHFILE) FFLAGS = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -program $(FLASHFILE)