Merge pull request #9134 from aabadie/pr/makefiles/riottools

makefiles/tools: use RIOTTOOLS variable

makefiles/tools/bossa.inc.mk

-export FLASHER ?= $(RIOTBASE)/dist/tools/bossa/bossac
+export FLASHER ?= $(RIOTTOOLS)/bossa/bossac
 export FFLAGS  ?= -p $(PORT) -e -i -w -v -b -R $(HEXFILE)
 
 HEXFILE = $(BINFILE)
@@ -20,6 +20,6 @@ endif
 
 # if we go with the default (BOSSA shipped with RIOT), we download and build
 # the tool if not already done
-ifeq ($(RIOTBASE)/dist/tools/bossa/bossac,$(FLASHER))
-  FLASHDEPS += $(RIOTBASE)/dist/tools/bossa/bossac
+ifeq ($(RIOTTOOLS)/bossa/bossac,$(FLASHER))
+  FLASHDEPS += $(RIOTTOOLS)/bossa/bossac
 endif

makefiles/tools/edbg.inc.mk

-RIOT_EDBG = $(RIOTBASE)/dist/tools/edbg/edbg
+RIOT_EDBG = $(RIOTTOOLS)/edbg/edbg
 EDBG ?= $(RIOT_EDBG)
 FLASHER ?= $(EDBG)
 HEXFILE = $(BINFILE)

makefiles/tools/jlink.inc.mk

-export FLASHER = $(RIOTBASE)/dist/tools/jlink/jlink.sh
-export DEBUGGER = $(RIOTBASE)/dist/tools/jlink/jlink.sh
-export DEBUGSERVER = $(RIOTBASE)/dist/tools/jlink/jlink.sh
-export RESET = $(RIOTBASE)/dist/tools/jlink/jlink.sh
+export FLASHER = $(RIOTTOOLS)/jlink/jlink.sh
+export DEBUGGER = $(RIOTTOOLS)/jlink/jlink.sh
+export DEBUGSERVER = $(RIOTTOOLS)/jlink/jlink.sh
+export RESET = $(RIOTTOOLS)/jlink/jlink.sh
 
 HEXFILE = $(BINFILE)
 

makefiles/tools/openocd.inc.mk

-export FLASHER ?= $(RIOTBASE)/dist/tools/openocd/openocd.sh
-export DEBUGGER = $(RIOTBASE)/dist/tools/openocd/openocd.sh
-export DEBUGSERVER = $(RIOTBASE)/dist/tools/openocd/openocd.sh
-export RESET ?= $(RIOTBASE)/dist/tools/openocd/openocd.sh
+export FLASHER ?= $(RIOTTOOLS)/openocd/openocd.sh
+export DEBUGGER = $(RIOTTOOLS)/openocd/openocd.sh
+export DEBUGSERVER = $(RIOTTOOLS)/openocd/openocd.sh
+export RESET ?= $(RIOTTOOLS)/openocd/openocd.sh
 
 export FFLAGS ?= flash
 export DEBUGGER_FLAGS ?= debug

makefiles/tools/renode.inc.mk

-export EMULATOR ?= $(RIOTBASE)/dist/tools/renode/run-renode.sh
+export EMULATOR ?= $(RIOTTOOLS)/renode/run-renode.sh
 export EMULATOR_FLAGS ?= start

makefiles/tools/serial.inc.mk

@@ -14,7 +14,7 @@ export BAUD ?= 115200
 
 RIOT_TERMINAL ?= pyterm
 ifeq ($(RIOT_TERMINAL),pyterm)
-    export TERMPROG  ?= $(RIOTBASE)/dist/tools/pyterm/pyterm
+    export TERMPROG  ?= $(RIOTTOOLS)/pyterm/pyterm
     export TERMFLAGS ?= -p "$(PORT)" -b "$(BAUD)"
 else ifeq ($(RIOT_TERMINAL),picocom)
     export TERMPROG  ?= picocom

makefiles/tools/targets.inc.mk

@@ -5,12 +5,12 @@
 # default target when `make` is called without any further argument.
 
 # target for building the bossac binary
-$(RIOTBASE)/dist/tools/bossa/bossac:
+$(RIOTTOOLS)/bossa/bossac:
 	@echo "[INFO] bossac binary not found - building it from source"
-	@make -C $(RIOTBASE)/dist/tools/bossa
+	@make -C $(RIOTTOOLS)/bossa
 	@echo "[INFO] bossac binary successfully build!"
 
-$(RIOTBASE)/dist/tools/edbg/edbg:
+$(RIOTTOOLS)/edbg/edbg:
 	@echo "[INFO] edbg binary not found - building it from source now"
-	CC= CFLAGS= make -C $(RIOTBASE)/dist/tools/edbg
+	CC= CFLAGS= make -C $(RIOTTOOLS)/edbg
 	@echo "[INFO] edbg binary successfully build!"