Skip to content
Snippets Groups Projects
Commit 11d26779 authored by Hauke Petersen's avatar Hauke Petersen
Browse files

boards: s/FLASHTOOL/PROGRAMMER/

parent dce3015e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
boards/calliope-mini/Makefile.include
+ 3
− 3
View file @ 11d26779
...@@ -10,8 +10,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*))) ...@@ -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)) ...@@ -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
......
boards/microbit/Makefile.include
+ 3
− 3
View file @ 11d26779
...@@ -10,8 +10,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) ...@@ -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)) ...@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment