From 7467d1be7593ffad541d4aea588eedb75fa9f1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Fri, 1 Mar 2019 16:11:01 +0100 Subject: [PATCH] makefiles/murdock.inc.mk: do not overwrite FLASHFILE if set If FLASHFILE is set keep the original value. It changes the variable from an immediate to a deferred variable but if murdocks keeps working there is no issue. --- makefiles/murdock.inc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefiles/murdock.inc.mk b/makefiles/murdock.inc.mk index f34d8ea15b..945802f701 100644 --- a/makefiles/murdock.inc.mk +++ b/makefiles/murdock.inc.mk @@ -2,8 +2,8 @@ # This file contains helper targets used by the CI. # -# (HACK) get actual flash binary from FFLAGS. -FLASHFILE:=$(filter $(HEXFILE) $(ELFFILE:.elf=.bin) $(ELFFILE),$(FFLAGS)) +# (HACK) get actual flash binary from FFLAGS if not defined. +FLASHFILE ?= $(filter $(HEXFILE) $(ELFFILE:.elf=.bin) $(ELFFILE),$(FFLAGS)) # # This target will run "make test" on the CI cluster.