From 41a891f284a44eb9761ebf4b56a74f3fa3fedb15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= <gaetan.harter@fu-berlin.de>
Date: Mon, 9 Sep 2019 17:23:01 +0200
Subject: [PATCH] tools: use 'BOARDSDIR' for the boards directory

Replace uses of 'RIOTBOARD' by 'BOARDSDIR' for tools.
---
 dist/gdbinit-docker                            | 2 +-
 dist/tools/openocd/openocd.sh                  | 4 ++--
 dist/tools/renode/run-renode.sh                | 4 ++--
 makefiles/tools/avrdude.inc.mk                 | 2 +-
 makefiles/tools/openocd-adapters/stlink.inc.mk | 2 +-
 makefiles/tools/uniflash.inc.mk                | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dist/gdbinit-docker b/dist/gdbinit-docker
index a3e4f1b39c..b24aa12755 100644
--- a/dist/gdbinit-docker
+++ b/dist/gdbinit-docker
@@ -18,7 +18,7 @@ except KeyError:
 else:
     gdb.execute('set substitute-path /data/riotbuild/riotcpu ' + path)
 try:
-    path = os.environ['RIOTBOARD']
+    path = os.environ['BOARDSDIR']
 except KeyError:
     # Environment variable wasn't set.
     pass
diff --git a/dist/tools/openocd/openocd.sh b/dist/tools/openocd/openocd.sh
index d9e8b0b7ad..0363d18776 100755
--- a/dist/tools/openocd/openocd.sh
+++ b/dist/tools/openocd/openocd.sh
@@ -13,7 +13,7 @@
 # Global environment variables used:
 # OPENOCD:             OpenOCD command name, default: "openocd"
 # OPENOCD_CONFIG:      OpenOCD configuration file name,
-#                      default: "${RIOTBOARD}/${BOARD}/dist/openocd.cfg"
+#                      default: "${BOARDSDIR}/${BOARD}/dist/openocd.cfg"
 #
 # The script supports the following actions:
 #
@@ -66,7 +66,7 @@
 # Default TCL port, set to 0 to disable
 : ${TCL_PORT:=6333}
 # Default path to OpenOCD configuration file
-: ${OPENOCD_CONFIG:=${RIOTBOARD}/${BOARD}/dist/openocd.cfg}
+: ${OPENOCD_CONFIG:=${BOARDSDIR}/${BOARD}/dist/openocd.cfg}
 # Default OpenOCD command
 : ${OPENOCD:=openocd}
 # Extra board initialization commands to pass to OpenOCD
diff --git a/dist/tools/renode/run-renode.sh b/dist/tools/renode/run-renode.sh
index 1164708e3f..8b20e6be14 100755
--- a/dist/tools/renode/run-renode.sh
+++ b/dist/tools/renode/run-renode.sh
@@ -13,14 +13,14 @@
 # Global environment variables used:
 # RENODE:              Renode command name, default: "renode"
 # RENODE_CONFIG:       Renode configuration file name,
-#                      default: "${RIOTBOARD}/${BOARD}/dist/board.resc"
+#                      default: "${BOARDSDIR}/${BOARD}/dist/board.resc"
 # RENODE_BIN_CONFIG:   Renode intermediate configuration file name,
 #                      default: "${BINDIR}/board.resc"
 #
 # @author       Bas Stottelaar <basstottelaar@gmail.com>
 
 # Default path to Renode configuration file
-: ${RENODE_CONFIG:=${RIOTBOARD}/${BOARD}/dist/board.resc}
+: ${RENODE_CONFIG:=${BOARDSDIR}/${BOARD}/dist/board.resc}
 # Default path to Renode intermediate configuration file
 : ${RENODE_BIN_CONFIG:=${BINDIR}/board.resc}
 # Default Renode command
diff --git a/makefiles/tools/avrdude.inc.mk b/makefiles/tools/avrdude.inc.mk
index 5bde9d60e3..c5a317b892 100644
--- a/makefiles/tools/avrdude.inc.mk
+++ b/makefiles/tools/avrdude.inc.mk
@@ -1,5 +1,5 @@
 FLASHER = avrdude
-DIST_PATH = $(RIOTBOARD)/$(BOARD)/dist
+DIST_PATH = $(BOARDSDIR)/$(BOARD)/dist
 DEBUGSERVER_PORT = 4242
 DEBUGSERVER = $(DIST_PATH)/debug_srv.sh
 DEBUGSERVER_INTERFACE ?=
diff --git a/makefiles/tools/openocd-adapters/stlink.inc.mk b/makefiles/tools/openocd-adapters/stlink.inc.mk
index c9b12908e0..c86a691248 100644
--- a/makefiles/tools/openocd-adapters/stlink.inc.mk
+++ b/makefiles/tools/openocd-adapters/stlink.inc.mk
@@ -18,7 +18,7 @@ export OPENOCD_ADAPTER_INIT
 ifeq (,$(OPENOCD_CONFIG))
   # if no openocd default configuration is provided by the board,
   # use the STM32 common one
-  ifeq (0,$(words $(wildcard $(RIOTBOARD)/$(BOARD)/dist/openocd.cfg)))
+  ifeq (0,$(words $(wildcard $(BOARDSDIR)/$(BOARD)/dist/openocd.cfg)))
     export OPENOCD_CONFIG := $(RIOTBASE)/boards/common/stm32/dist/$(CPU).cfg
   endif
 endif
diff --git a/makefiles/tools/uniflash.inc.mk b/makefiles/tools/uniflash.inc.mk
index eff7c09b43..af74e1281e 100644
--- a/makefiles/tools/uniflash.inc.mk
+++ b/makefiles/tools/uniflash.inc.mk
@@ -1,9 +1,9 @@
 # http://www.ti.com/tool/uniflash
 FLASHFILE ?= $(ELFFILE)
 
-UNIFLASH_CONFIG_CCXML ?= $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml
-UNIFLASH_CONFIG_DAT ?= $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).dat
-UNIFLASH_CONFIG_GDB ?= $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_gdb.conf
+UNIFLASH_CONFIG_CCXML ?= $(BOARDSDIR)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml
+UNIFLASH_CONFIG_DAT ?= $(BOARDSDIR)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).dat
+UNIFLASH_CONFIG_GDB ?= $(BOARDSDIR)/$(BOARD)/dist/$(CPU_MODEL)_gdb.conf
 
 export UNIFLASH_PATH ?= "UNIFLASH_PATH unconfigured"
 # check which uniflash version is available, either 4.x or 3.x