RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

Merge pull request #7075 from haukepetersen/fix_minibit_programmerflashtoolvarname

Browse Source 
boards: s/FLASHTOOL/PROGRAMMER/
This commit is contained in:
Alexandre Abadie 2017-05-18 18:01:33 +02:00 committed by GitHub
commit fb0412097b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boards/calliope-mini/Makefile.include
View File

@ -10,8 +10,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
include $(RIOTMAKE)/tools/serial.inc.mk include $(RIOTMAKE)/tools/serial.inc.mk
# we support flashing through plain fscopy or using JLink # we support flashing through plain fscopy or using JLink
FLASHTOOL ?= fscopy PROGRAMMER ?= fscopy
ifeq (fscopy,$(FLASHTOOL)) ifeq (fscopy,$(PROGRAMMER))
export OFLAGS = -O ihex export OFLAGS = -O ihex
export HEXFILE = $(ELFFILE:.elf=.hex) export HEXFILE = $(ELFFILE:.elf=.hex)
export FFLAGS = export FFLAGS =
@ -20,7 +20,7 @@ ifeq (fscopy,$(FLASHTOOL))
export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
export DEBUGGER = export DEBUGGER =
export DEBUGSERVER = export DEBUGSERVER =
else ifeq (jlink,$(FLASHTOOL)) else ifeq (jlink,$(PROGRAMMER))
export JLINK_DEVICE := nrf51822 export JLINK_DEVICE := nrf51822
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk
else else

6
boards/microbit/Makefile.include
View File

@ -10,8 +10,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
include $(RIOTMAKE)/tools/serial.inc.mk include $(RIOTMAKE)/tools/serial.inc.mk
# we support flashing through plain fscopy or using JLink # we support flashing through plain fscopy or using JLink
FLASHTOOL ?= fscopy PROGRAMMER ?= fscopy
ifeq (fscopy,$(FLASHTOOL)) ifeq (fscopy,$(PROGRAMMER))
export OFLAGS = -O ihex export OFLAGS = -O ihex
export HEXFILE = $(ELFFILE:.elf=.hex) export HEXFILE = $(ELFFILE:.elf=.hex)
export FFLAGS = export FFLAGS =
@ -20,7 +20,7 @@ ifeq (fscopy,$(FLASHTOOL))
export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
export DEBUGGER = export DEBUGGER =
export DEBUGSERVER = export DEBUGSERVER =
else ifeq (jlink,$(FLASHTOOL)) else ifeq (jlink,$(PROGRAMMER))
export JLINK_DEVICE := nrf51822 export JLINK_DEVICE := nrf51822
include $(RIOTMAKE)/tools/jlink.inc.mk include $(RIOTMAKE)/tools/jlink.inc.mk
else else