Merge pull request #11649 from smlng/pr/make/reset

make: allow to override RESET and RESET_FLAGS for all boards and tools
RIOT-OS · Jun 7, 2019 · b9c15c3 · b9c15c3
2 parents a32c22e + 34c2eac
commit b9c15c3
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include
@@ -17,7 +17,7 @@ include $(RIOTMAKE)/tools/renode.inc.mk
 # debugger config
 DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
 DEBUGSERVER = JLinkGDBServer -device CC2538SF53
-RESET = $(RIOTBOARD)/$(BOARD)/dist/reset.sh
+RESET ?= $(RIOTBOARD)/$(BOARD)/dist/reset.sh
 
 # Define the flash-tool and default port:
 export PROGRAMMER ?= cc2538-bsl
@@ -33,6 +33,6 @@ endif
 OFLAGS = --gap-fill 0xff
 FLASHFILE ?= $(BINFILE)
 DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
-RESET_FLAGS = $(BINDIR)
+RESET_FLAGS ?= $(BINDIR)
 
 export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
diff --git a/boards/common/esp32/Makefile.include b/boards/common/esp32/Makefile.include
@@ -8,4 +8,4 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 include $(RIOTMAKE)/tools/serial.inc.mk
 
 # reset tool configuration
-RESET = esptool.py --before default_reset run
+RESET ?= esptool.py --before default_reset run
diff --git a/boards/common/esp8266/Makefile.include b/boards/common/esp8266/Makefile.include
@@ -8,4 +8,4 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 include $(RIOTMAKE)/tools/serial.inc.mk
 
 # reset tool configuration
-RESET = esptool.py --before default_reset run
+RESET ?= esptool.py --before default_reset run
diff --git a/boards/common/remote/Makefile.include b/boards/common/remote/Makefile.include
@@ -12,16 +12,16 @@ ifeq ($(PROGRAMMER),cc2538-bsl)
   else ifeq ($(OS),Darwin)
     PORT_BSL ?= $(PORT_DARWIN)
   endif
-  RESET = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py -p "$(PORT_BSL)"
+  RESET ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py -p "$(PORT_BSL)"
   FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
   FFLAGS  = -p "$(PORT_BSL)" -e -w -v -b 115200 $(FLASHFILE)
 else ifeq ($(PROGRAMMER),jlink)
   FLASHER = $(RIOTBOARD)/common/remote/dist/flash.sh
   FFLAGS  = $(BINDIR) $(FLASHFILE)
   DEBUGGER = $(RIOTBOARD)/common/remote/dist/debug.sh
   DEBUGSERVER = JLinkGDBServer -device CC2538SF53
-  RESET = $(RIOTBOARD)/common/remote/dist/reset.sh
-  RESET_FLAGS = $(BINDIR)
+  RESET ?= $(RIOTBOARD)/common/remote/dist/reset.sh
+  RESET_FLAGS ?= $(BINDIR)
 endif
 
 OFLAGS = --gap-fill 0xff

diff --git a/boards/common/stm32f103c8/Makefile.include b/boards/common/stm32f103c8/Makefile.include
@@ -25,7 +25,7 @@ ifeq ($(PROGRAMMER),dfu-util)
   export ROM_OFFSET ?= 0x2000 # Skip the space needed by the embedded bootloader
   FLASHER = dfu-util
   DEBUGGER = # no debugger
-  RESET = # dfu-util has no support for resetting the device
+  RESET ?= # dfu-util has no support for resetting the device
 
   HEXFILE = $(BINFILE)
   FFLAGS = -d 1eaf:0003 -a 2 -D "$(HEXFILE)"

diff --git a/boards/nz32-sc151/Makefile.include b/boards/nz32-sc151/Makefile.include
@@ -11,7 +11,7 @@ export ID ?= 0483:df11
 
 FLASHER = dfu-util
 DEBUGGER = # dfu-util has no debugger
-RESET = # dfu-util has no support for resetting the device
+RESET ?= # dfu-util has no support for resetting the device
 
 HEXFILE = $(BINFILE)
 FFLAGS = -d $(ID) -a 0 -s 0x08000000:leave -D "$(HEXFILE)"

diff --git a/boards/openmote-b/Makefile.include b/boards/openmote-b/Makefile.include
@@ -23,12 +23,12 @@ else ifeq ($(PROGRAMMER),jlink)
   FFLAGS  = $(BINDIR) $(FLASHFILE)
   DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
   DEBUGSERVER = JLinkGDBServer -device CC2538SF53
-  RESET = $(RIOTBOARD)/$(BOARD)/dist/reset.sh
+  RESET ?= $(RIOTBOARD)/$(BOARD)/dist/reset.sh
 endif
 
 FLASHFILE ?= $(BINFILE)
 DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
-RESET_FLAGS = $(BINDIR)
+RESET_FLAGS ?= $(BINDIR)
 export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
 
 # setup serial terminal

diff --git a/boards/spark-core/Makefile.include b/boards/spark-core/Makefile.include
@@ -9,7 +9,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 
 FLASHER = dfu-util
 DEBUGGER = # spark core has no debugger
-RESET = # dfu-util has no support for resetting the device
+RESET ?= # dfu-util has no support for resetting the device
 
 HEXFILE = $(BINFILE)
 FFLAGS = -d 1d50:607f -a 0 -s 0x08005000:leave -D "$(HEXFILE)"

diff --git a/makefiles/tools/jlink.inc.mk b/makefiles/tools/jlink.inc.mk
@@ -1,7 +1,7 @@
 FLASHER = $(RIOTTOOLS)/jlink/jlink.sh
 DEBUGGER = $(RIOTTOOLS)/jlink/jlink.sh
 DEBUGSERVER = $(RIOTTOOLS)/jlink/jlink.sh
-RESET = $(RIOTTOOLS)/jlink/jlink.sh
+RESET ?= $(RIOTTOOLS)/jlink/jlink.sh
 
 FLASHFILE ?= $(BINFILE)
 

diff --git a/makefiles/tools/uniflash.inc.mk b/makefiles/tools/uniflash.inc.mk
@@ -12,13 +12,13 @@ ifneq ("$(wildcard $(UNIFLASH_PATH)/dslite.sh)","")
   _XDS110RESET_4_0_4_3 ?= $(UNIFLASH_PATH)/simplelink/gen2/bin/xds110reset
   _XDS110RESET ?= $(UNIFLASH_PATH)/simplelink/imagecreator/bin/xds110reset
   XDS110RESET ?= $(firstword $(wildcard $(_XDS110RESET) $(_XDS110RESET_4_0_4_3)) xds110reset)
-  RESET = $(XDS110RESET)
+  RESET ?= $(XDS110RESET)
 else
   FLASHER = $(UNIFLASH_PATH)/uniflash.sh
   FFLAGS  = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -program $(FLASHFILE)
   # configure uniflash for resetting target
-  RESET = $(UNIFLASH_PATH)/uniflash.sh
-  RESET_FLAGS = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -reset
+  RESET ?= $(UNIFLASH_PATH)/uniflash.sh
+  RESET_FLAGS ?= -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -reset
 endif
 # configure the debug server
 DEBUGSERVER = $(UNIFLASH_PATH)/ccs_base/common/uscif/gdb_agent_console