From a7e17927e40d7aac04e756b8b72a5db53ea86625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Thu, 14 Mar 2019 17:40:27 +0100 Subject: [PATCH 1/2] makefiles/pyocd.inc.mk: remove OFLAGS OFLAGS is set by the `.bin` and `.hex` rules no need to define it anymore. --- makefiles/tools/pyocd.inc.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/makefiles/tools/pyocd.inc.mk b/makefiles/tools/pyocd.inc.mk index f8ba7c6547..12b7a8d727 100644 --- a/makefiles/tools/pyocd.inc.mk +++ b/makefiles/tools/pyocd.inc.mk @@ -3,7 +3,6 @@ DEBUGGER = $(RIOTBASE)/dist/tools/pyocd/pyocd.sh DEBUGSERVER = $(RIOTBASE)/dist/tools/pyocd/pyocd.sh RESET ?= $(RIOTBASE)/dist/tools/pyocd/pyocd.sh -export OFLAGS ?= -O ihex FFLAGS ?= flash $(HEXFILE) DEBUGGER_FLAGS ?= debug $(ELFFILE) DEBUGSERVER_FLAGS ?= debug-server From f874f241fa874d1be8ca8495251b94dcf83dcc2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= Date: Thu, 14 Mar 2019 17:48:30 +0100 Subject: [PATCH 2/2] makefiles/pyocd.inc.mk use FLASHFILE Update to use FLASHFILE as file to be flashed on the board. --- makefiles/tools/pyocd.inc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makefiles/tools/pyocd.inc.mk b/makefiles/tools/pyocd.inc.mk index 12b7a8d727..4b1593f841 100644 --- a/makefiles/tools/pyocd.inc.mk +++ b/makefiles/tools/pyocd.inc.mk @@ -3,7 +3,8 @@ DEBUGGER = $(RIOTBASE)/dist/tools/pyocd/pyocd.sh DEBUGSERVER = $(RIOTBASE)/dist/tools/pyocd/pyocd.sh RESET ?= $(RIOTBASE)/dist/tools/pyocd/pyocd.sh -FFLAGS ?= flash $(HEXFILE) +FLASHFILE ?= $(HEXFILE) +FFLAGS ?= flash $(FLASHFILE) DEBUGGER_FLAGS ?= debug $(ELFFILE) DEBUGSERVER_FLAGS ?= debug-server RESET_FLAGS ?= reset