From 90bcb016bb46329ffafc639e75d947623ce8b97d Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Wed, 27 Nov 2019 14:31:01 +0100 Subject: [PATCH] boards: unexport PROGRAMMER --- boards/cc2538dk/Makefile.include | 2 +- boards/common/msb-430/Makefile.include | 2 +- boards/common/remote/Makefile.include | 2 +- boards/openmote-b/Makefile.include | 2 +- boards/openmote-cc2538/Makefile.include | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include index 25d3a09264..008f5863f9 100644 --- a/boards/cc2538dk/Makefile.include +++ b/boards/cc2538dk/Makefile.include @@ -16,7 +16,7 @@ DEBUGSERVER = JLinkGDBServer -device CC2538SF53 RESET ?= $(RIOTBOARD)/$(BOARD)/dist/reset.sh # Define the flash-tool and default port: -export PROGRAMMER ?= cc2538-bsl +PROGRAMMER ?= cc2538-bsl ifeq ($(PROGRAMMER),cc2538-bsl) FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py diff --git a/boards/common/msb-430/Makefile.include b/boards/common/msb-430/Makefile.include index 512ba18c8c..171775e531 100644 --- a/boards/common/msb-430/Makefile.include +++ b/boards/common/msb-430/Makefile.include @@ -5,7 +5,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) include $(RIOTMAKE)/tools/serial.inc.mk # setup flash tool -export PROGRAMMER ?= olimex +PROGRAMMER ?= olimex MSPDEBUGFLAGS += -j $(PROGRAMMER) ifeq ($(strip $(PROGRAMMER)),uif) MSPDEBUGFLAGS += -d $(PROG_DEV) diff --git a/boards/common/remote/Makefile.include b/boards/common/remote/Makefile.include index f2d6ea1841..61c2e089c7 100644 --- a/boards/common/remote/Makefile.include +++ b/boards/common/remote/Makefile.include @@ -1,5 +1,5 @@ # define the default flash-tool -export PROGRAMMER ?= cc2538-bsl +PROGRAMMER ?= cc2538-bsl # setup serial terminal include $(RIOTMAKE)/tools/serial.inc.mk diff --git a/boards/openmote-b/Makefile.include b/boards/openmote-b/Makefile.include index 7ff96c527e..fb518d92d5 100644 --- a/boards/openmote-b/Makefile.include +++ b/boards/openmote-b/Makefile.include @@ -6,7 +6,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*))) include $(RIOTMAKE)/tools/serial.inc.mk # Set default flash tool -export PROGRAMMER ?= cc2538-bsl +PROGRAMMER ?= cc2538-bsl # For backward compatibility ifneq (,$(PORT_BSL)) diff --git a/boards/openmote-cc2538/Makefile.include b/boards/openmote-cc2538/Makefile.include index 81671bef69..0d490721c3 100644 --- a/boards/openmote-cc2538/Makefile.include +++ b/boards/openmote-cc2538/Makefile.include @@ -5,7 +5,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial*))) # setup serial terminal include $(RIOTMAKE)/tools/serial.inc.mk # Set default flash tool -export PROGRAMMER ?= cc2538-bsl +PROGRAMMER ?= cc2538-bsl ifeq ($(PROGRAMMER),jlink) # setup JLink for flashing