From 6e8d3246e6e36ad099bfdab2ccd71dc110fd59cf Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Sat, 8 Jan 2022 12:04:02 +0100 Subject: [PATCH] makefiles/tools: remove deprecated FFLAGS_OPTS variable --- makefiles/tools/bossa.inc.mk | 6 ------ makefiles/tools/cc2538-bsl.inc.mk | 6 ------ makefiles/tools/dfu-util.inc.mk | 6 ------ makefiles/tools/uf2conv.inc.mk | 6 ------ 4 files changed, 24 deletions(-) diff --git a/makefiles/tools/bossa.inc.mk b/makefiles/tools/bossa.inc.mk index 8e5ab377c3..4e258e31ee 100644 --- a/makefiles/tools/bossa.inc.mk +++ b/makefiles/tools/bossa.inc.mk @@ -2,12 +2,6 @@ BOSSA_VERSION ?= 1.9 FLASHFILE ?= $(BINFILE) FLASHER ?= $(RIOTTOOLS)/bossa-$(BOSSA_VERSION)/bossac -# Warn about deprecated variables -ifneq (,$(FFLAGS_OPTS)) - $(warning Warning! FFLAGS_OPTS is deprecated use BOSSA_FLAGS_OPTS) - BOSSA_FLAGS_OPTS ?= $(FFLAGS_OPTS) -endif - BOSSA_FLAGS_OPTS ?= # Only use ROM_OFFSET with Bossa version 1.9 diff --git a/makefiles/tools/cc2538-bsl.inc.mk b/makefiles/tools/cc2538-bsl.inc.mk index 9fc047353a..acd44b79eb 100644 --- a/makefiles/tools/cc2538-bsl.inc.mk +++ b/makefiles/tools/cc2538-bsl.inc.mk @@ -3,12 +3,6 @@ FLASHFILE ?= $(CC2538_BSL_FLASHFILE) CC2538_BSL ?= $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py PROG_BAUD ?= 500000 # default value in cc2538-bsl -# Warn about deprecated variables -ifneq (,$(FFLAGS_OPTS)) - $(warning Warning! FFLAGS_OPTS is deprecated use CC2538_BSL_FLAGS_OPTS) - CC2538_BSL_FLAGS_OPTS ?= $(FFLAGS_OPTS) -endif - CC2538_BSL_FLAGS_OPTS ?= CC2538_BSL_FLAGS = $(if $(IMAGE_OFFSET), -a $(shell printf "0x%08x" $$(($(IMAGE_OFFSET) + $(ROM_START_ADDR))))) CC2538_BSL_FLAGS += -p "$(PROG_DEV)" $(CC2538_BSL_FLAGS_OPTS) --write-erase -v -b $(PROG_BAUD) $(FLASHFILE) diff --git a/makefiles/tools/dfu-util.inc.mk b/makefiles/tools/dfu-util.inc.mk index bbdc80c566..55e7b59fa0 100644 --- a/makefiles/tools/dfu-util.inc.mk +++ b/makefiles/tools/dfu-util.inc.mk @@ -10,12 +10,6 @@ _ROM_ADDR_WITH_OFFSET ?= $(shell printf "0x%x" $$(($(ROM_START_ADDR) + $(ROM_OFF FLASH_ADDR ?= $(if $(ROM_OFFSET),$(_ROM_ADDR_WITH_OFFSET),$(ROM_START_ADDR)) DFU_USE_DFUSE ?= 0 -# Warn about deprecated variables -ifneq (,$(FFLAGS_OPTS)) - $(warning Warning! FFLAGS_OPTS is deprecated use DFU_UTIL_FLAGS_OPTS) - DFU_UTIL_FLAGS_OPTS ?= $(FFLAGS_OPTS) -endif - # Optional flasher flags DFU_UTIL_FLAGS_OPTS ?= diff --git a/makefiles/tools/uf2conv.inc.mk b/makefiles/tools/uf2conv.inc.mk index a000f71335..c2a952e939 100644 --- a/makefiles/tools/uf2conv.inc.mk +++ b/makefiles/tools/uf2conv.inc.mk @@ -1,11 +1,5 @@ FLASHFILE ?= $(HEXFILE) -# Warn about deprecated variables -ifneq (,$(FFLAGS_OPTS)) - $(warning Warning! FFLAGS_OPTS is deprecated use UF2CONV_FLAGS) - UF2CONV_FLAGS ?= $(FFLAGS_OPTS) -endif - FLASHER ?= $(RIOTTOOLS)/uf2/uf2conv.py FFLAGS ?= $(UF2CONV_FLAGS) $(FLASHFILE)