From 11d26779f66792f5698603acd9ed09f52a7868f6 Mon Sep 17 00:00:00 2001
From: Hauke Petersen <hauke.petersen@fu-berlin.de>
Date: Thu, 18 May 2017 13:18:54 +0200
Subject: [PATCH] boards: s/FLASHTOOL/PROGRAMMER/

---
 boards/calliope-mini/Makefile.include | 6 +++---
 boards/microbit/Makefile.include      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/boards/calliope-mini/Makefile.include b/boards/calliope-mini/Makefile.include
index 3d131cdeda..6bf90d6696 100644
--- a/boards/calliope-mini/Makefile.include
+++ b/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
diff --git a/boards/microbit/Makefile.include b/boards/microbit/Makefile.include
index 4c566a29d4..86174391e5 100644
--- a/boards/microbit/Makefile.include
+++ b/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
-- 
GitLab