riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15971 from aabadie/pr/make/emulate_flash_bug

Browse Source 
make/emulate: fix bugs when using flash target
This commit is contained in:
Alexandre Abadie 2021-02-16 11:56:04 +01:00 committed by GitHub
commit 09df6a4549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makefiles/tools/cc2538-bsl.inc.mk
View File

@ -1,10 +1,13 @@
FLASHFILE ?= $(BINFILE) FLASHFILE ?= $(BINFILE)
FLASHER ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py CC2538_BSL ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
FFLAGS_OPTS ?= FFLAGS_OPTS ?=
PROG_BAUD ?= 500000 # default value in cc2538-bsl PROG_BAUD ?= 500000 # default value in cc2538-bsl
FFLAGS = $(if $(IMAGE_OFFSET), -a $(shell printf "0x%08x" $$(($(IMAGE_OFFSET) + $(ROM_START_ADDR))))) CC2538_BSL_FLAGS = $(if $(IMAGE_OFFSET), -a $(shell printf "0x%08x" $$(($(IMAGE_OFFSET) + $(ROM_START_ADDR)))))
FFLAGS += -p "$(PROG_DEV)" $(FFLAGS_OPTS) --write-erase -v -b $(PROG_BAUD) $(FLASHFILE) CC2538_BSL_FLAGS += -p "$(PROG_DEV)" $(FFLAGS_OPTS) --write-erase -v -b $(PROG_BAUD) $(FLASHFILE)
FLASHER ?= $(CC2538_BSL)
FFLAGS ?= $(CC2538_BSL_FLAGS)
RESET ?= $(FLASHER) -p "$(PROG_DEV)" $(FFLAGS_OPTS) -b $(PROG_BAUD) RESET ?= $(FLASHER) -p "$(PROG_DEV)" $(FFLAGS_OPTS) -b $(PROG_BAUD)

2
makefiles/tools/jlink.inc.mk
View File

@ -1,4 +1,4 @@
FLASHER = $(RIOTTOOLS)/jlink/jlink.sh FLASHER ?= $(RIOTTOOLS)/jlink/jlink.sh
DEBUGGER ?= $(RIOTTOOLS)/jlink/jlink.sh DEBUGGER ?= $(RIOTTOOLS)/jlink/jlink.sh
DEBUGSERVER ?= $(RIOTTOOLS)/jlink/jlink.sh DEBUGSERVER ?= $(RIOTTOOLS)/jlink/jlink.sh
RESET ?= $(RIOTTOOLS)/jlink/jlink.sh RESET ?= $(RIOTTOOLS)/jlink/jlink.sh