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

makefiles/tools: use RIOTTOOLS variable

Browse Source
This commit is contained in:
Alexandre Abadie 2018-05-15 11:29:33 +02:00
parent ecb2e4767d
commit f04f954a21
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

8
makefiles/tools/jlink.inc.mk
View File

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

8
makefiles/tools/openocd.inc.mk
View File

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

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

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

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

@ -14,7 +14,7 @@ export BAUD ?= 115200
RIOT_TERMINAL ?= pyterm RIOT_TERMINAL ?= pyterm
ifeq ($(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)" export TERMFLAGS ?= -p "$(PORT)" -b "$(BAUD)"
else ifeq ($(RIOT_TERMINAL),picocom) else ifeq ($(RIOT_TERMINAL),picocom)
export TERMPROG ?= picocom export TERMPROG ?= picocom

8
makefiles/tools/targets.inc.mk
View File

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