Browse Source

Merge pull request #7075 from haukepetersen/fix_minibit_programmerflashtoolvarname

boards: s/FLASHTOOL/PROGRAMMER/
master
Alexandre Abadie 5 years ago committed by GitHub
parent
commit
fb0412097b
  1. 6
      boards/calliope-mini/Makefile.include
  2. 6
      boards/microbit/Makefile.include

6
boards/calliope-mini/Makefile.include

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

6
boards/microbit/Makefile.include

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

Loading…
Cancel
Save