diff --git a/boards/cc2538dk/Makefile.include b/boards/cc2538dk/Makefile.include index a88bce1957..f1f2f54668 100644 --- a/boards/cc2538dk/Makefile.include +++ b/boards/cc2538dk/Makefile.include @@ -19,9 +19,7 @@ RESET ?= $(RIOTBOARD)/cc2538dk/dist/reset.sh PROGRAMMER ?= cc2538-bsl ifeq ($(PROGRAMMER),cc2538-bsl) - FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py - FLASHDEPS += $(FLASHER) - FFLAGS = -p "$(PROG_DEV)" -e -w -v $(FLASHFILE) + include $(RIOTMAKE)/tools/cc2538-bsl.inc.mk else ifeq ($(PROGRAMMER),jlink) FLASHER = $(RIOTBOARD)/cc2538dk/dist/flash.sh FFLAGS = $(BINDIR) $(FLASHFILE) diff --git a/boards/common/remote/Makefile.include b/boards/common/remote/Makefile.include index 92c804ec0f..34f09b141d 100644 --- a/boards/common/remote/Makefile.include +++ b/boards/common/remote/Makefile.include @@ -11,10 +11,8 @@ ifneq (,$(PORT_BSL)) endif ifeq ($(PROGRAMMER),cc2538-bsl) - RESET ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py -p "$(PROG_DEV)" - FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py - FLASHDEPS += $(FLASHER) - FFLAGS = -p "$(PROG_DEV)" -e -w -v -b 115200 $(FLASHFILE) + PROG_BAUD ?= 115200 + include $(RIOTMAKE)/tools/cc2538-bsl.inc.mk else ifeq ($(PROGRAMMER),jlink) FLASHER = $(RIOTBOARD)/common/remote/dist/flash.sh FFLAGS = $(BINDIR) $(FLASHFILE) diff --git a/boards/openmote-b/Makefile.include b/boards/openmote-b/Makefile.include index 826737a022..083cf28468 100644 --- a/boards/openmote-b/Makefile.include +++ b/boards/openmote-b/Makefile.include @@ -16,11 +16,9 @@ endif ifeq ($(PROGRAMMER),cc2538-bsl) FLASHFILE ?= $(HEXFILE) - FLASHER = $(RIOTBASE)/dist/tools/cc2538-bsl/cc2538-bsl.py - FLASHDEPS += $(FLASHER) - FFLAGS = -p "$(PROG_DEV)" --bootloader-invert-lines -e -w -v -b 460800 $(FLASHFILE) - RESET ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py - RESET_FLAGS ?= -p "$(PROG_DEV)" --bootloader-invert-lines + FFLAGS_OPTS ?= --bootloader-invert-lines + PROG_BAUD ?= 460800 + include $(RIOTMAKE)/tools/cc2538-bsl.inc.mk else ifeq ($(PROGRAMMER),jlink) # Special flashing and reset scripts are required due to board hardware export FLASH_ADDR = 0x200000 diff --git a/boards/openmote-cc2538/Makefile.include b/boards/openmote-cc2538/Makefile.include index 58379bbe1a..f05ef48ba9 100644 --- a/boards/openmote-cc2538/Makefile.include +++ b/boards/openmote-cc2538/Makefile.include @@ -14,9 +14,7 @@ ifeq ($(PROGRAMMER),jlink) export JLINK_IF := JTAG export TUI := 1 include $(RIOTMAKE)/tools/jlink.inc.mk -else - FLASHFILE ?= $(BINFILE) - FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py - FLASHDEPS += $(FLASHER) - FFLAGS = -p "$(PROG_DEV)" -e -w -v -b 460800 $(FLASHFILE) +else ifeq ($(PROGRAMMER),cc2538-bsl) + PROG_BAUD ?= 460800 + include $(RIOTMAKE)/tools/cc2538-bsl.inc.mk endif