From 5d604c6fb57443ca2ea7b9c7a587146a61cd12a7 Mon Sep 17 00:00:00 2001 From: smlng Date: Thu, 13 Jul 2017 22:32:44 +0200 Subject: [PATCH] board, cc2650stk: fix make reset with uniflash4.x --- boards/cc2650stk/Makefile.include | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/boards/cc2650stk/Makefile.include b/boards/cc2650stk/Makefile.include index 6dcc65f024..4e37cdcf14 100644 --- a/boards/cc2650stk/Makefile.include +++ b/boards/cc2650stk/Makefile.include @@ -15,9 +15,15 @@ export UNIFLASH_PATH ?= "UNIFLASH_PATH unconfigured" ifneq ("$(wildcard $(UNIFLASH_PATH)/dslite.sh)","") export FLASHER ?= $(UNIFLASH_PATH)/dslite.sh 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 export FLASHER = $(UNIFLASH_PATH)/uniflash.sh 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 # configure the debug server 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 export DEBUGGER = $(PREFIX)gdb 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