From 7ac924f15c730008ef69be975c44b581fa6cf21d Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Thu, 18 Feb 2021 17:54:30 +0100 Subject: [PATCH] make: namespace uf2conv specific flags variable --- boards/nrf52840-mdk-dongle/Makefile.include | 2 +- makefiles/tools/uf2conv.inc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boards/nrf52840-mdk-dongle/Makefile.include b/boards/nrf52840-mdk-dongle/Makefile.include index d2356761f5..5cef8a15e5 100644 --- a/boards/nrf52840-mdk-dongle/Makefile.include +++ b/boards/nrf52840-mdk-dongle/Makefile.include @@ -12,7 +12,7 @@ ifeq (uf2conv,$(PROGRAMMER)) ROM_OFFSET = 0x1000 ROM_LEN = 0xf3000 - FFLAGS_OPTS = -f 0xADA52840 + UF2CONV_FLAGS = -f 0xADA52840 include $(RIOTMAKE)/tools/usb_board_reset.mk endif diff --git a/makefiles/tools/uf2conv.inc.mk b/makefiles/tools/uf2conv.inc.mk index 5749826527..c2a952e939 100644 --- a/makefiles/tools/uf2conv.inc.mk +++ b/makefiles/tools/uf2conv.inc.mk @@ -1,7 +1,7 @@ FLASHFILE ?= $(HEXFILE) FLASHER ?= $(RIOTTOOLS)/uf2/uf2conv.py -FFLAGS ?= $(FFLAGS_OPTS) $(FLASHFILE) +FFLAGS ?= $(UF2CONV_FLAGS) $(FLASHFILE) PREFLASH_DELAY ?= 2