Merge pull request #13568 from benpicco/cc2538-bsl.py-upstream

dist/tools/cc2538-bsl: use upstream version
This commit is contained in:
benpicco 2020-03-06 14:08:09 +01:00 committed by GitHub
commit dbe1270f66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 20 additions and 1236 deletions

View File

@ -20,6 +20,7 @@ PROGRAMMER ?= cc2538-bsl
ifeq ($(PROGRAMMER),cc2538-bsl) ifeq ($(PROGRAMMER),cc2538-bsl)
FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
FLASHDEPS += $(FLASHER)
FFLAGS = -p "$(PROG_DEV)" -e -w -v $(FLASHFILE) FFLAGS = -p "$(PROG_DEV)" -e -w -v $(FLASHFILE)
else ifeq ($(PROGRAMMER),jlink) else ifeq ($(PROGRAMMER),jlink)
FLASHER = $(RIOTBOARD)/cc2538dk/dist/flash.sh FLASHER = $(RIOTBOARD)/cc2538dk/dist/flash.sh

View File

@ -13,6 +13,7 @@ endif
ifeq ($(PROGRAMMER),cc2538-bsl) ifeq ($(PROGRAMMER),cc2538-bsl)
RESET ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py -p "$(PROG_DEV)" RESET ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py -p "$(PROG_DEV)"
FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
FLASHDEPS += $(FLASHER)
FFLAGS = -p "$(PROG_DEV)" -e -w -v -b 115200 $(FLASHFILE) FFLAGS = -p "$(PROG_DEV)" -e -w -v -b 115200 $(FLASHFILE)
else ifeq ($(PROGRAMMER),jlink) else ifeq ($(PROGRAMMER),jlink)
FLASHER = $(RIOTBOARD)/common/remote/dist/flash.sh FLASHER = $(RIOTBOARD)/common/remote/dist/flash.sh

View File

@ -17,6 +17,7 @@ endif
ifeq ($(PROGRAMMER),cc2538-bsl) ifeq ($(PROGRAMMER),cc2538-bsl)
FLASHFILE ?= $(HEXFILE) FLASHFILE ?= $(HEXFILE)
FLASHER = $(RIOTBASE)/dist/tools/cc2538-bsl/cc2538-bsl.py FLASHER = $(RIOTBASE)/dist/tools/cc2538-bsl/cc2538-bsl.py
FLASHDEPS += $(FLASHER)
FFLAGS = -p "$(PROG_DEV)" --bootloader-invert-lines -e -w -v -b 460800 $(FLASHFILE) FFLAGS = -p "$(PROG_DEV)" --bootloader-invert-lines -e -w -v -b 460800 $(FLASHFILE)
RESET ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py RESET ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
RESET_FLAGS ?= -p "$(PROG_DEV)" --bootloader-invert-lines RESET_FLAGS ?= -p "$(PROG_DEV)" --bootloader-invert-lines

View File

@ -17,5 +17,6 @@ ifeq ($(PROGRAMMER),jlink)
else else
FLASHFILE ?= $(BINFILE) FLASHFILE ?= $(BINFILE)
FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
FLASHDEPS += $(FLASHER)
FFLAGS = -p "$(PROG_DEV)" -e -w -v -b 460800 $(FLASHFILE) FFLAGS = -p "$(PROG_DEV)" -e -w -v -b 460800 $(FLASHFILE)
endif endif

1
dist/tools/cc2538-bsl/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
cc2538-bsl.py

10
dist/tools/cc2538-bsl/Makefile vendored Normal file
View File

@ -0,0 +1,10 @@
PKG_NAME=cc2538-bsl
PKG_URL=https://github.com/JelmerT/cc2538-bsl.git
PKG_VERSION=733e6f5b496402e40ad6d12df3d0372e205b8883
PKG_LICENSE=BSD-3-Clause
PKG_BUILDDIR=$(CURDIR)/bin
include $(RIOTBASE)/pkg/pkg.mk
all:
cp $(PKG_BUILDDIR)/cc2538-bsl.py .

File diff suppressed because it is too large Load Diff

View File

@ -17,6 +17,11 @@ $(RIOTTOOLS)/pic32prog/pic32prog: $(RIOTTOOLS)/pic32prog/Makefile
make -C $(@D) make -C $(@D)
@echo "[INFO] $(@F) binary successfully built!" @echo "[INFO] $(@F) binary successfully built!"
$(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py:
@echo "[INFO] cc2538-bsl.py not found - fetching it from GitHub now"
CC= CFLAGS= make -C $(RIOTTOOLS)/cc2538-bsl
@echo "[INFO] cc2538-bsl.py successfully fetched!"
$(RIOTTOOLS)/edbg/edbg: $(RIOTTOOLS)/edbg/Makefile $(RIOTTOOLS)/edbg/edbg: $(RIOTTOOLS)/edbg/Makefile
@echo "[INFO] edbg binary not found - building it from source now" @echo "[INFO] edbg binary not found - building it from source now"
CC= CFLAGS= make -C $(RIOTTOOLS)/edbg CC= CFLAGS= make -C $(RIOTTOOLS)/edbg