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

Merge pull request #11254 from cladmi/pr/make/openocd/flashfile

Browse Source 
makefiles/openocd.inc.mk: use FLASHFILE
This commit is contained in:
Gaëtan Harter 2019-03-28 11:56:59 +01:00 committed by GitHub
commit 29ada72a9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boards/seeeduino_arch-pro/Makefile.include
View File

@ -10,8 +10,8 @@ include $(RIOTMAKE)/tools/serial.inc.mk
DEBUG_ADAPTER ?= dap DEBUG_ADAPTER ?= dap
# this board uses openocd # this board uses openocd with an HEXFILE
FFLAGS ?= flash $(HEXFILE) FLASHFILE ?= $(HEXFILE)
include $(RIOTMAKE)/tools/openocd.inc.mk include $(RIOTMAKE)/tools/openocd.inc.mk
# generate image checksum from hex file # generate image checksum from hex file

10
makefiles/boot/riotboot.mk
View File

@ -97,30 +97,24 @@ $(RIOTBOOT_EXTENDED_BIN): $(RIOTBOOT_COMBINED_BIN)
$(Q)truncate -s $$(($(SLOT0_OFFSET) + $(SLOT0_LEN) + $(RIOTBOOT_HDR_LEN))) $@.tmp $(Q)truncate -s $$(($(SLOT0_OFFSET) + $(SLOT0_LEN) + $(RIOTBOOT_HDR_LEN))) $@.tmp
$(Q)mv $@.tmp $@ $(Q)mv $@.tmp $@
# Flashing rule for openocd to flash combined/extended binaries # Flashing rule for combined binaries
riotboot/flash-combined-slot0: ELFFILE=$(RIOTBOOT_COMBINED_BIN)
riotboot/flash-extended-slot0: ELFFILE=$(RIOTBOOT_EXTENDED_BIN)
riotboot/flash-combined-slot0: FLASHFILE=$(RIOTBOOT_COMBINED_BIN) riotboot/flash-combined-slot0: FLASHFILE=$(RIOTBOOT_COMBINED_BIN)
riotboot/flash-combined-slot0: $(RIOTBOOT_COMBINED_BIN) $(FLASHDEPS) riotboot/flash-combined-slot0: $(RIOTBOOT_COMBINED_BIN) $(FLASHDEPS)
$(flash-recipe) $(flash-recipe)
# Flashing rule for extended binaries
riotboot/flash-extended-slot0: FLASHFILE=$(RIOTBOOT_EXTENDED_BIN) riotboot/flash-extended-slot0: FLASHFILE=$(RIOTBOOT_EXTENDED_BIN)
riotboot/flash-extended-slot0: $(RIOTBOOT_EXTENDED_BIN) $(FLASHDEPS) riotboot/flash-extended-slot0: $(RIOTBOOT_EXTENDED_BIN) $(FLASHDEPS)
$(flash-recipe) $(flash-recipe)
# Flashing rule for slot 0 # Flashing rule for slot 0
riotboot/flash-slot0: export IMAGE_OFFSET=$(SLOT0_OFFSET) riotboot/flash-slot0: export IMAGE_OFFSET=$(SLOT0_OFFSET)
# openocd
riotboot/flash-slot0: ELFFILE=$(SLOT0_RIOT_BIN)
riotboot/flash-slot0: FLASHFILE=$(SLOT0_RIOT_BIN) riotboot/flash-slot0: FLASHFILE=$(SLOT0_RIOT_BIN)
riotboot/flash-slot0: $(SLOT0_RIOT_BIN) $(FLASHDEPS) riotboot/flash-slot0: $(SLOT0_RIOT_BIN) $(FLASHDEPS)
$(flash-recipe) $(flash-recipe)
# Flashing rule for slot 1 # Flashing rule for slot 1
riotboot/flash-slot1: export IMAGE_OFFSET=$(SLOT1_OFFSET) riotboot/flash-slot1: export IMAGE_OFFSET=$(SLOT1_OFFSET)
# openocd
riotboot/flash-slot1: ELFFILE=$(SLOT1_RIOT_BIN)
riotboot/flash-slot1: FLASHFILE=$(SLOT1_RIOT_BIN) riotboot/flash-slot1: FLASHFILE=$(SLOT1_RIOT_BIN)
riotboot/flash-slot1: $(SLOT1_RIOT_BIN) $(FLASHDEPS) riotboot/flash-slot1: $(SLOT1_RIOT_BIN) $(FLASHDEPS)
$(flash-recipe) $(flash-recipe)

3
makefiles/tools/openocd.inc.mk
View File

@ -3,7 +3,8 @@ export DEBUGGER = $(RIOTTOOLS)/openocd/openocd.sh
export DEBUGSERVER = $(RIOTTOOLS)/openocd/openocd.sh export DEBUGSERVER = $(RIOTTOOLS)/openocd/openocd.sh
export RESET ?= $(RIOTTOOLS)/openocd/openocd.sh export RESET ?= $(RIOTTOOLS)/openocd/openocd.sh
export FFLAGS ?= flash $(ELFFILE) FLASHFILE ?= $(ELFFILE)
export FFLAGS ?= flash $(FLASHFILE)
export DEBUGGER_FLAGS ?= debug $(ELFFILE) export DEBUGGER_FLAGS ?= debug $(ELFFILE)
export DEBUGSERVER_FLAGS ?= debug-server export DEBUGSERVER_FLAGS ?= debug-server
export RESET_FLAGS ?= reset export RESET_FLAGS ?= reset

4
tests/riotboot/Makefile
View File

@ -24,7 +24,3 @@ FLASHFILE = $(RIOTBOOT_COMBINED_BIN)
include ../Makefile.tests_common include ../Makefile.tests_common
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include
# This is currently hacky as the flasher are not using 'FLASHFILE'
# openocd
ELFFILE = $(FLASHFILE)