From f04f954a21bbb183345f974f6aa46c3c0ef133ff Mon Sep 17 00:00:00 2001
From: Alexandre Abadie <alexandre.abadie@inria.fr>
Date: Tue, 15 May 2018 11:29:33 +0200
Subject: [PATCH] makefiles/tools: use RIOTTOOLS variable
---
makefiles/tools/bossa.inc.mk | 6 +++---
makefiles/tools/edbg.inc.mk | 2 +-
makefiles/tools/jlink.inc.mk | 8 ++++----
makefiles/tools/openocd.inc.mk | 8 ++++----
makefiles/tools/renode.inc.mk | 2 +-
makefiles/tools/serial.inc.mk | 2 +-
makefiles/tools/targets.inc.mk | 8 ++++----
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/makefiles/tools/bossa.inc.mk b/makefiles/tools/bossa.inc.mk
index 304d350a56..b98eee54da 100644
--- a/makefiles/tools/bossa.inc.mk
+++ b/makefiles/tools/bossa.inc.mk
@@ -1,4 +1,4 @@
-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
diff --git a/makefiles/tools/edbg.inc.mk b/makefiles/tools/edbg.inc.mk
index cf9e26c767..5738b49cd0 100644
--- a/makefiles/tools/edbg.inc.mk
+++ b/makefiles/tools/edbg.inc.mk
@@ -1,4 +1,4 @@
-RIOT_EDBG = $(RIOTBASE)/dist/tools/edbg/edbg
+RIOT_EDBG = $(RIOTTOOLS)/edbg/edbg
EDBG ?= $(RIOT_EDBG)
FLASHER ?= $(EDBG)
HEXFILE = $(BINFILE)
diff --git a/makefiles/tools/jlink.inc.mk b/makefiles/tools/jlink.inc.mk
index ab6921bc46..a53eb7cb97 100644
--- a/makefiles/tools/jlink.inc.mk
+++ b/makefiles/tools/jlink.inc.mk
@@ -1,7 +1,7 @@
-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)
diff --git a/makefiles/tools/openocd.inc.mk b/makefiles/tools/openocd.inc.mk
index d2f8bf2e77..79d2e5390e 100644
--- a/makefiles/tools/openocd.inc.mk
+++ b/makefiles/tools/openocd.inc.mk
@@ -1,7 +1,7 @@
-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
diff --git a/makefiles/tools/renode.inc.mk b/makefiles/tools/renode.inc.mk
index b4587961a6..3f50283254 100644
--- a/makefiles/tools/renode.inc.mk
+++ b/makefiles/tools/renode.inc.mk
@@ -1,2 +1,2 @@
-export EMULATOR ?= $(RIOTBASE)/dist/tools/renode/run-renode.sh
+export EMULATOR ?= $(RIOTTOOLS)/renode/run-renode.sh
export EMULATOR_FLAGS ?= start
diff --git a/makefiles/tools/serial.inc.mk b/makefiles/tools/serial.inc.mk
index 95e24fd2ac..810a1d8b4c 100644
--- a/makefiles/tools/serial.inc.mk
+++ b/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
diff --git a/makefiles/tools/targets.inc.mk b/makefiles/tools/targets.inc.mk
index 4be923a92a..7a3a0085d1 100644
--- a/makefiles/tools/targets.inc.mk
+++ b/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!"
--
GitLab