From 3af10a604ecf5254ba718ad0fe69011e48782e28 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Thu, 16 Aug 2018 16:33:51 +0200 Subject: [PATCH 1/2] edbg.inc.mk: do not erase the whole rom before flashing This mimics openocd behaviour that only erase needed sectors of the rom. --- makefiles/tools/edbg.inc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/tools/edbg.inc.mk b/makefiles/tools/edbg.inc.mk index 5738b49cd0..589d65a248 100644 --- a/makefiles/tools/edbg.inc.mk +++ b/makefiles/tools/edbg.inc.mk @@ -10,7 +10,7 @@ HEXFILE = $(BINFILE) ifneq (,$(DEBUG_ADAPTER_ID)) EDBG_ARGS += --serial $(DEBUG_ADAPTER_ID) endif -FFLAGS ?= $(EDBG_ARGS) -t $(EDBG_DEVICE_TYPE) -b -e -v -p -f $(HEXFILE) +FFLAGS ?= $(EDBG_ARGS) -t $(EDBG_DEVICE_TYPE) -b -v -p -f $(HEXFILE) ifeq ($(RIOT_EDBG),$(FLASHER)) FLASHDEPS += $(RIOT_EDBG) From e6776ae8d1928c03172bc567ac315a22c1a8e26f Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser Date: Thu, 16 Aug 2018 16:36:05 +0200 Subject: [PATCH 2/2] edbg.inc.mk: allow flashing with an offset in rom Allow flashing with an offset in ROM from the rom base address. It reuses `IMAGE_OFFSET` configuration variable name from `openocd.sh`. This will allow flashing multiple images with different flash operations. --- makefiles/tools/edbg.inc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/makefiles/tools/edbg.inc.mk b/makefiles/tools/edbg.inc.mk index 589d65a248..12d945a153 100644 --- a/makefiles/tools/edbg.inc.mk +++ b/makefiles/tools/edbg.inc.mk @@ -10,6 +10,10 @@ HEXFILE = $(BINFILE) ifneq (,$(DEBUG_ADAPTER_ID)) EDBG_ARGS += --serial $(DEBUG_ADAPTER_ID) endif + +# Set offset according to IMAGE_OFFSET if it's defined +EDBG_ARGS += $(addprefix --offset ,$(IMAGE_OFFSET)) + FFLAGS ?= $(EDBG_ARGS) -t $(EDBG_DEVICE_TYPE) -b -v -p -f $(HEXFILE) ifeq ($(RIOT_EDBG),$(FLASHER))