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

board, cc2650stk: fix make reset with uniflash4.x

Browse Source
This commit is contained in:
smlng 2017-07-13 22:32:44 +02:00
parent b54f1106f6
commit 5d604c6fb5
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boards/cc2650stk/Makefile.include
View File

@ -15,9 +15,15 @@ export UNIFLASH_PATH ?= "UNIFLASH_PATH unconfigured"
ifneq ("$(wildcard $(UNIFLASH_PATH)/dslite.sh)","") ifneq ("$(wildcard $(UNIFLASH_PATH)/dslite.sh)","")
export FLASHER ?= $(UNIFLASH_PATH)/dslite.sh export FLASHER ?= $(UNIFLASH_PATH)/dslite.sh
export FFLAGS = --config $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml $(ELFFILE) export FFLAGS = --config $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml $(ELFFILE)
# configure uniflash for resetting target
export RESET = $(UNIFLASH_PATH)/simplelink/gen2/bin/xds110reset
export RESET_FLAGS
else else
export FLASHER = $(UNIFLASH_PATH)/uniflash.sh export FLASHER = $(UNIFLASH_PATH)/uniflash.sh
export FFLAGS = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -program $(ELFFILE) export FFLAGS = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -program $(ELFFILE)
# configure uniflash for resetting target
export RESET = $(UNIFLASH_PATH)/uniflash.sh
export RESET_FLAGS = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -reset
endif endif
# configure the debug server # configure the debug server
export DEBUGSERVER = $(UNIFLASH_PATH)/ccs_base/common/uscif/gdb_agent_console export DEBUGSERVER = $(UNIFLASH_PATH)/ccs_base/common/uscif/gdb_agent_console
@ -26,7 +32,3 @@ export DEBUGSERVER_FLAGS = -p 3333 $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDE
# configure the debugging tool # configure the debugging tool
export DEBUGGER = $(PREFIX)gdb export DEBUGGER = $(PREFIX)gdb
export DEBUGGER_FLAGS = -x $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_gdb.conf $(ELFFILE) export DEBUGGER_FLAGS = -x $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_gdb.conf $(ELFFILE)
# configure uniflash for resetting target
export RESET = $(UNIFLASH_PATH)/uniflash.sh
export RESET_FLAGS = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -reset