RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

tools: use 'BOARDSDIR' for the boards directory

Browse Source 
Replace uses of 'RIOTBOARD' by 'BOARDSDIR' for tools.
This commit is contained in:
Gaëtan Harter 2019-09-09 17:23:01 +02:00 committed by Alexandre Abadie
parent 90692ac92b
commit 41a891f284
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/gdbinit-docker vendored
View File

@ -18,7 +18,7 @@ except KeyError:
else: else:
gdb.execute('set substitute-path /data/riotbuild/riotcpu ' + path) gdb.execute('set substitute-path /data/riotbuild/riotcpu ' + path)
try: try:
path = os.environ['RIOTBOARD'] path = os.environ['BOARDSDIR']
except KeyError: except KeyError:
# Environment variable wasn't set. # Environment variable wasn't set.
pass pass

4
dist/tools/openocd/openocd.sh vendored
View File

@ -13,7 +13,7 @@
# Global environment variables used: # Global environment variables used:
# OPENOCD: OpenOCD command name, default: "openocd" # OPENOCD: OpenOCD command name, default: "openocd"
# OPENOCD_CONFIG: OpenOCD configuration file name, # OPENOCD_CONFIG: OpenOCD configuration file name,
# default: "${RIOTBOARD}/${BOARD}/dist/openocd.cfg" # default: "${BOARDSDIR}/${BOARD}/dist/openocd.cfg"
# #
# The script supports the following actions: # The script supports the following actions:
# #
@ -66,7 +66,7 @@
# Default TCL port, set to 0 to disable # Default TCL port, set to 0 to disable
: ${TCL_PORT:=6333} : ${TCL_PORT:=6333}
# Default path to OpenOCD configuration file # Default path to OpenOCD configuration file
: ${OPENOCD_CONFIG:=${RIOTBOARD}/${BOARD}/dist/openocd.cfg} : ${OPENOCD_CONFIG:=${BOARDSDIR}/${BOARD}/dist/openocd.cfg}
# Default OpenOCD command # Default OpenOCD command
: ${OPENOCD:=openocd} : ${OPENOCD:=openocd}
# Extra board initialization commands to pass to OpenOCD # Extra board initialization commands to pass to OpenOCD

4
dist/tools/renode/run-renode.sh vendored
View File

@ -13,14 +13,14 @@
# Global environment variables used: # Global environment variables used:
# RENODE: Renode command name, default: "renode" # RENODE: Renode command name, default: "renode"
# RENODE_CONFIG: Renode configuration file name, # 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, # RENODE_BIN_CONFIG: Renode intermediate configuration file name,
# default: "${BINDIR}/board.resc" # default: "${BINDIR}/board.resc"
# #
# @author Bas Stottelaar <basstottelaar@gmail.com> # @author Bas Stottelaar <basstottelaar@gmail.com>
# Default path to Renode configuration file # 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 # Default path to Renode intermediate configuration file
: ${RENODE_BIN_CONFIG:=${BINDIR}/board.resc} : ${RENODE_BIN_CONFIG:=${BINDIR}/board.resc}
# Default Renode command # Default Renode command

2
makefiles/tools/avrdude.inc.mk
View File

@ -1,5 +1,5 @@
FLASHER = avrdude FLASHER = avrdude
DIST_PATH = $(RIOTBOARD)/$(BOARD)/dist DIST_PATH = $(BOARDSDIR)/$(BOARD)/dist
DEBUGSERVER_PORT = 4242 DEBUGSERVER_PORT = 4242
DEBUGSERVER = $(DIST_PATH)/debug_srv.sh DEBUGSERVER = $(DIST_PATH)/debug_srv.sh
DEBUGSERVER_INTERFACE ?= DEBUGSERVER_INTERFACE ?=

2
makefiles/tools/openocd-adapters/stlink.inc.mk
View File

@ -18,7 +18,7 @@ export OPENOCD_ADAPTER_INIT
ifeq (,$(OPENOCD_CONFIG)) ifeq (,$(OPENOCD_CONFIG))
# if no openocd default configuration is provided by the board, # if no openocd default configuration is provided by the board,
# use the STM32 common one # 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 export OPENOCD_CONFIG := $(RIOTBASE)/boards/common/stm32/dist/$(CPU).cfg
endif endif
endif endif

6
makefiles/tools/uniflash.inc.mk
View File

@ -1,9 +1,9 @@
# http://www.ti.com/tool/uniflash # http://www.ti.com/tool/uniflash
FLASHFILE ?= $(ELFFILE) FLASHFILE ?= $(ELFFILE)
UNIFLASH_CONFIG_CCXML ?= $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml UNIFLASH_CONFIG_CCXML ?= $(BOARDSDIR)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml
UNIFLASH_CONFIG_DAT ?= $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).dat UNIFLASH_CONFIG_DAT ?= $(BOARDSDIR)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).dat
UNIFLASH_CONFIG_GDB ?= $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_gdb.conf UNIFLASH_CONFIG_GDB ?= $(BOARDSDIR)/$(BOARD)/dist/$(CPU_MODEL)_gdb.conf
export UNIFLASH_PATH ?= "UNIFLASH_PATH unconfigured" export UNIFLASH_PATH ?= "UNIFLASH_PATH unconfigured"
# check which uniflash version is available, either 4.x or 3.x # check which uniflash version is available, either 4.x or 3.x