From e70efb769cb08f0edd5bb531f38c87b54ff25d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Mon, 12 Aug 2019 11:08:35 +0200 Subject: [PATCH] murdock: nordic_softdevice_ble: softdevice.hex is a test input When running tests using 'nordic_softdevice_ble', the 'softdevice.hex' file must also be taken into account for the test hashing and be uploaded to the separated murdock testing boards. When listed as dependency from `test-input-hash` the file must have a target, which he has not. The file is implicitly created when compiling `ELFFILE` so declare it as order only dependency. In practice `BASELIBS` could be enough or even `pkg-build-softdevice` but I do not want to be depend that much on internals there. --- boards/common/nrf52/Makefile.include | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/boards/common/nrf52/Makefile.include b/boards/common/nrf52/Makefile.include index fab00bf457..46dd5fffbd 100644 --- a/boards/common/nrf52/Makefile.include +++ b/boards/common/nrf52/Makefile.include @@ -24,6 +24,12 @@ ifeq (jlink,$(PROGRAMMER)) export JLINK_PRE_FLASH := erase\nloadfile $(BINDIR)/softdevice.hex export FLASH_ADDR := 0x1f000 export LINKER_SCRIPT ?= $(RIOTCPU)/$(CPU)/ldscripts/$(CPU_MODEL)_sd.ld + # murdock: softdevice.hex file is used for flashing + # It must be taken into account for the test input hash and + # be sent to the separated testing boards + TEST_EXTRA_FILES += $(BINDIR)/softdevice.hex + # Files in TEST_EXTRA_FILES need to have an explicit target + $(BINDIR)/softdevice.hex: | $(ELFFILE) endif include $(RIOTMAKE)/tools/jlink.inc.mk else ifeq (openocd,$(PROGRAMMER))