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

make/emulate: fix bugs when using flash target
RIOT-OS · Feb 16, 2021 · 09df6a4 · 09df6a4
2 parents 4bacc4f + ed8f14e
commit 09df6a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/makefiles/tools/cc2538-bsl.inc.mk b/makefiles/tools/cc2538-bsl.inc.mk
@@ -1,10 +1,13 @@
 FLASHFILE ?= $(BINFILE)
-FLASHER ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
+CC2538_BSL ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
 FFLAGS_OPTS ?=
 PROG_BAUD ?= 500000	# default value in cc2538-bsl
 
-FFLAGS  = $(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  = $(if $(IMAGE_OFFSET), -a $(shell printf "0x%08x" $$(($(IMAGE_OFFSET) + $(ROM_START_ADDR)))))
+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)
 

diff --git a/makefiles/tools/jlink.inc.mk b/makefiles/tools/jlink.inc.mk
@@ -1,4 +1,4 @@
-FLASHER = $(RIOTTOOLS)/jlink/jlink.sh
+FLASHER ?= $(RIOTTOOLS)/jlink/jlink.sh
 DEBUGGER ?= $(RIOTTOOLS)/jlink/jlink.sh
 DEBUGSERVER ?= $(RIOTTOOLS)/jlink/jlink.sh
 RESET ?= $(RIOTTOOLS)/jlink/jlink.sh