1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

Merge pull request #12826 from fjmolinas/pr_unexport_programmer

boards: unexport PROGRAMMER
This commit is contained in:
Alexandre Abadie 2019-11-27 17:00:34 +01:00 committed by GitHub
commit d5cf54a674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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))

View File

@ -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