boards/tools: remove exporting FLASHER/FFLAGS

FLASHER and FFLAGS are evaluated by the main Makefile.include or by file included by it. Their value does not need to be exported. This will also prevent evaluating 'PORT' for FFLAGS when not needed. Testing ------- `git diff --word-diff` only reports `export` being removed. `git show --stat` reports `84 insertions(+), 84 deletions(-)` Which is the same amount as lines that where matching `export[[:blank::]]\+VARIABLE`.
2024-12-29 04:50:03 +01:00 · 2019-05-17 13:52:34 +02:00 · 2019-05-17 13:52:34 +02:00 · ac113ca2f8
commit ac113ca2f8
parent 04e76f323d
27 changed files with 84 additions and 84 deletions
--- a/boards/calliope-mini/Makefile.include
+++ b/boards/calliope-mini/Makefile.include
@ -10,10 +10,10 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))
 PROGRAMMER ?= fscopy

 ifeq (fscopy,$(PROGRAMMER))
-  export FFLAGS = $(HEXFILE)
+  FFLAGS = $(HEXFILE)
  export DEBUGGER_FLAGS =

-  export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
+  FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
  export DEBUGGER =
  export DEBUGSERVER =
 else ifeq (openocd,$(PROGRAMMER))
--- a/boards/cc2538dk/Makefile.include
+++ b/boards/cc2538dk/Makefile.include
@ -23,11 +23,11 @@ export RESET = $(RIOTBOARD)/$(BOARD)/dist/reset.sh
 export PROGRAMMER ?= cc2538-bsl

 ifeq ($(PROGRAMMER),cc2538-bsl)
-  export FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
-  export FFLAGS  = -p "$(PORT)" -e -w -v $(FLASHFILE)
+  FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
+  FFLAGS  = -p "$(PORT)" -e -w -v $(FLASHFILE)
 else ifeq ($(PROGRAMMER),jlink)
-  export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
-  export FFLAGS  = $(BINDIR) $(FLASHFILE)
+  FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
+  FFLAGS  = $(BINDIR) $(FLASHFILE)
 endif

 OFLAGS = --gap-fill 0xff
--- a/boards/chronos/Makefile.include
+++ b/boards/chronos/Makefile.include
@ -3,8 +3,8 @@ export CPU = cc430
 export CPU_MODEL = cc430f6137

 # flasher configuration
-export FLASHER = mspdebug
-export FFLAGS = rf2500 "prog $(HEXFILE)"
+FLASHER = mspdebug
+FFLAGS = rf2500 "prog $(HEXFILE)"

 INCLUDES += -I$(RIOTBOARD)/$(BOARD)/drivers/include

--- a/boards/common/msb-430/Makefile.include
+++ b/boards/common/msb-430/Makefile.include
@ -14,8 +14,8 @@ export MSPDEBUGFLAGS += -j $(PROGRAMMER)
 ifeq ($(strip $(PROGRAMMER)),uif)
  export MSPDEBUGFLAGS += -d $(PORT)
 endif
-export FLASHER ?= mspdebug
-export FFLAGS = $(MSPDEBUGFLAGS) "prog $(HEXFILE)"
+FLASHER ?= mspdebug
+FFLAGS = $(MSPDEBUGFLAGS) "prog $(HEXFILE)"

 # setup debugger
 export DEBUGSERVER = $(FLASHER)
--- a/boards/common/remote/Makefile.include
+++ b/boards/common/remote/Makefile.include
@ -13,11 +13,11 @@ ifeq ($(PROGRAMMER),cc2538-bsl)
    PORT_BSL ?= $(PORT_DARWIN)
  endif
  export RESET = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py -p "$(PORT_BSL)"
-  export FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
-  export FFLAGS  = -p "$(PORT_BSL)" -e -w -v -b 115200 $(FLASHFILE)
+  FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
+  FFLAGS  = -p "$(PORT_BSL)" -e -w -v -b 115200 $(FLASHFILE)
 else ifeq ($(PROGRAMMER),jlink)
-  export FLASHER = $(RIOTBOARD)/common/remote/dist/flash.sh
-  export FFLAGS  = $(BINDIR) $(FLASHFILE)
+  FLASHER = $(RIOTBOARD)/common/remote/dist/flash.sh
+  FFLAGS  = $(BINDIR) $(FLASHFILE)
  export DEBUGGER = $(RIOTBOARD)/common/remote/dist/debug.sh
  export DEBUGSERVER = JLinkGDBServer -device CC2538SF53
  export RESET = $(RIOTBOARD)/common/remote/dist/reset.sh
--- a/boards/common/stm32f103c8/Makefile.include
+++ b/boards/common/stm32f103c8/Makefile.include
@ -23,14 +23,14 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 # (ground) GPIO B1.
 ifeq ($(PROGRAMMER),dfu-util)
  export ROM_OFFSET ?= 0x2000 # Skip the space needed by the embedded bootloader
-  export FLASHER = dfu-util
+  FLASHER = dfu-util
  export DEBUGGER = # no debugger
  export RESET = # dfu-util has no support for resetting the device

  HEXFILE = $(BINFILE)
-  export FFLAGS = -d 1eaf:0003 -a 2 -D "$(HEXFILE)"
+  FFLAGS = -d 1eaf:0003 -a 2 -D "$(HEXFILE)"
  # for older bootloader versions use this:
-  #export FFLAGS = -d 1d50:6017 -s 0x08002000:leave -D "$(HEXFILE)"
+  # FFLAGS = -d 1d50:6017 -s 0x08002000:leave -D "$(HEXFILE)"
 else

  # this board uses openocd by default
--- a/boards/common/wsn430/Makefile.include
+++ b/boards/common/wsn430/Makefile.include
@ -13,8 +13,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 include $(RIOTMAKE)/tools/serial.inc.mk

 # configure the flash tool
-export FLASHER = mspdebug
-export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
+FLASHER = mspdebug
+FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"

 # Use the HEXFILE when using iot-lab.single.inc.mk
 IOTLAB_FLASHFILE = $(HEXFILE)
--- a/boards/f4vi1/Makefile.include
+++ b/boards/f4vi1/Makefile.include
@ -13,11 +13,11 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 include $(RIOTMAKE)/tools/serial.inc.mk

 # st-flash
-export FLASHER = st-flash
+FLASHER = st-flash
 export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
 export DEBUGSERVER = st-util

 # define st-flash parameters
 HEXFILE = $(BINFILE)
-export FFLAGS = write $(HEXFILE) 0x8000000
+FFLAGS = write $(HEXFILE) 0x8000000
 export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(ELFFILE)
--- a/boards/hifive1/Makefile.include
+++ b/boards/hifive1/Makefile.include
@ -17,4 +17,4 @@ export OPENOCD_CMD_RESET_RUN=-c _reset
 include $(RIOTMAKE)/tools/openocd.inc.mk

 # use our own openocd script to flash since HiFive1 has reset problems.
-export FLASHER = $(RIOTBASE)/boards/hifive1/dist/flasher.sh
+FLASHER = $(RIOTBASE)/boards/hifive1/dist/flasher.sh
--- a/boards/mbed_lpc1768/Makefile.include
+++ b/boards/mbed_lpc1768/Makefile.include
@ -1,12 +1,12 @@
 # define the cpu used by the mbed_lpx1768 board
 export CPU = lpc1768

-export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
+FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
 export DEBUGGER =
 export DEBUGSERVER =

 HEXFILE = $(BINFILE)
-export FFLAGS = $(HEXFILE)
+FFLAGS = $(HEXFILE)
 export DEBUGGER_FLAGS =

 # define the default port depending on the host OS
--- a/boards/microbit/Makefile.include
+++ b/boards/microbit/Makefile.include
@ -10,10 +10,10 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 PROGRAMMER ?= fscopy

 ifeq (fscopy,$(PROGRAMMER))
-  export FFLAGS = $(HEXFILE)
+  FFLAGS = $(HEXFILE)
  export DEBUGGER_FLAGS =

-  export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
+  FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
  export DEBUGGER =
  export DEBUGSERVER =
 else ifeq (openocd,$(PROGRAMMER))
--- a/boards/native/Makefile.include
+++ b/boards/native/Makefile.include
@ -41,7 +41,7 @@ else
 endif

 TERMPROG ?= $(ELFFILE)
-export FLASHER = true
+FLASHER = true
 export VALGRIND ?= valgrind
 export CGANNOTATE ?= cg_annotate
 export GPROF ?= gprof
--- a/boards/nz32-sc151/Makefile.include
+++ b/boards/nz32-sc151/Makefile.include
@ -9,12 +9,12 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 # set the default id
 export ID ?= 0483:df11

-export FLASHER = dfu-util
+FLASHER = dfu-util
 export DEBUGGER = # dfu-util has no debugger
 export RESET = # dfu-util has no support for resetting the device

 HEXFILE = $(BINFILE)
-export FFLAGS = -d $(ID) -a 0 -s 0x08000000:leave -D "$(HEXFILE)"
+FFLAGS = -d $(ID) -a 0 -s 0x08000000:leave -D "$(HEXFILE)"

 # setup serial terminal
 include $(RIOTMAKE)/tools/serial.inc.mk
--- a/boards/opencm904/Makefile.include
+++ b/boards/opencm904/Makefile.include
@ -3,12 +3,12 @@ export CPU = stm32f1
 export CPU_MODEL = stm32f103cb

 # custom flasher to use with the bootloader
-export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/robotis-loader.py
+FLASHER = $(RIOTBOARD)/$(BOARD)/dist/robotis-loader.py
 export DEBUGGER =
 export DEBUGSERVER =

 HEXFILE = $(BINFILE)
-export FFLAGS = $(PORT) $(HEXFILE)
+FFLAGS = $(PORT) $(HEXFILE)
 export DEBUGGER_FLAGS =

 # define the default port depending on the host OS
--- a/boards/openmote-b/Makefile.include
+++ b/boards/openmote-b/Makefile.include
@ -16,11 +16,11 @@ ifeq ($(PROGRAMMER),cc2538-bsl)
  else ifeq ($(OS),Darwin)
    PORT_BSL ?= $(PORT_DARWIN)
  endif
-  export FLASHER = $(RIOTBASE)/dist/tools/cc2538-bsl/cc2538-bsl.py
-  export FFLAGS  = -p "$(PORT_BSL)" --bootloader-invert-lines -e -w -v -b 460800 $(FLASHFILE)
+  FLASHER = $(RIOTBASE)/dist/tools/cc2538-bsl/cc2538-bsl.py
+  FFLAGS  = -p "$(PORT_BSL)" --bootloader-invert-lines -e -w -v -b 460800 $(FLASHFILE)
 else ifeq ($(PROGRAMMER),jlink)
-  export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
-  export FFLAGS  = $(BINDIR) $(FLASHFILE)
+  FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
+  FFLAGS  = $(BINDIR) $(FLASHFILE)
  export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
  export DEBUGSERVER = JLinkGDBServer -device CC2538SF53
  export RESET = $(RIOTBOARD)/$(BOARD)/dist/reset.sh
--- a/boards/openmote-cc2538/Makefile.include
+++ b/boards/openmote-cc2538/Makefile.include
@ -18,8 +18,8 @@ ifeq ($(PROGRAMMER),jlink)
  include $(RIOTMAKE)/tools/jlink.inc.mk
 else
  FLASHFILE ?= $(BINFILE)
-  export FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
-  export FFLAGS  = -p "$(PORT)" -e -w -v -b 460800 $(FLASHFILE)
+  FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
+  FFLAGS  = -p "$(PORT)" -e -w -v -b 460800 $(FLASHFILE)
 endif

 # setup serial terminal
--- a/boards/spark-core/Makefile.include
+++ b/boards/spark-core/Makefile.include
@ -7,12 +7,12 @@ PORT_LINUX ?= /dev/ttyUSB0
 PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 include $(RIOTMAKE)/tools/serial.inc.mk

-export FLASHER = dfu-util
+FLASHER = dfu-util
 export DEBUGGER = # spark core has no debugger
 export RESET = # dfu-util has no support for resetting the device

 HEXFILE = $(BINFILE)
-export FFLAGS = -d 1d50:607f -a 0 -s 0x08005000:leave -D "$(HEXFILE)"
+FFLAGS = -d 1d50:607f -a 0 -s 0x08005000:leave -D "$(HEXFILE)"

 # Skip the space needed by the embedded bootloader
 export ROM_OFFSET ?= 0x5000
--- a/boards/telosb/Makefile.include
+++ b/boards/telosb/Makefile.include
@ -10,5 +10,5 @@ export BAUD ?= 9600
 include $(RIOTMAKE)/tools/serial.inc.mk

 # flash tool configuration
-export FLASHER = $(RIOTTOOLS)/goodfet/goodfet.bsl
-export FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
+FLASHER = $(RIOTTOOLS)/goodfet/goodfet.bsl
+FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
--- a/boards/z1/Makefile.include
+++ b/boards/z1/Makefile.include
@ -9,5 +9,5 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 include $(RIOTMAKE)/tools/serial.inc.mk

 # setup flash tool
-export FLASHER = $(RIOTTOOLS)/goodfet/goodfet.bsl
-export FFLAGS = --z1 -I -c $(PORT) -r -e -p $(HEXFILE)
+FLASHER = $(RIOTTOOLS)/goodfet/goodfet.bsl
+FFLAGS = --z1 -I -c $(PORT) -r -e -p $(HEXFILE)
--- a/cpu/esp32/Makefile.include
+++ b/cpu/esp32/Makefile.include
@ -161,24 +161,24 @@ export FLASHDEPS  = preflash

 # flasher configuration
 ifeq ($(QEMU), 1)
-    export FLASHER = dd
-    export FFLAGS += if=/dev/zero bs=1M count=4  | tr "\\000" "\\377" > tmp.bin && cat tmp.bin |
-    export FFLAGS += head -c $$((0x1000)) |
-    export FFLAGS += cat - $(RIOTCPU)/$(CPU)/bin/bootloader.bin tmp.bin |
-    export FFLAGS += head -c $$((0x8000)) |
-    export FFLAGS += cat - $(BINDIR)/partitions.bin tmp.bin |
-    export FFLAGS += head -c $$((0x10000)) |
-    export FFLAGS += cat - $(ELFFILE).bin tmp.bin |
-    export FFLAGS += head -c $$((0x400000)) > $(BINDIR)/esp32flash.bin && rm tmp.bin &&
-    export FFLAGS += cp $(RIOTCPU)/$(CPU)/bin/rom_0x3ff90000_0x00010000.bin $(BINDIR)/rom1.bin &&
-    export FFLAGS += cp $(RIOTCPU)/$(CPU)/bin/rom_0x40000000_0x000c2000.bin $(BINDIR)/rom.bin
+    FLASHER = dd
+    FFLAGS += if=/dev/zero bs=1M count=4  | tr "\\000" "\\377" > tmp.bin && cat tmp.bin |
+    FFLAGS += head -c $$((0x1000)) |
+    FFLAGS += cat - $(RIOTCPU)/$(CPU)/bin/bootloader.bin tmp.bin |
+    FFLAGS += head -c $$((0x8000)) |
+    FFLAGS += cat - $(BINDIR)/partitions.bin tmp.bin |
+    FFLAGS += head -c $$((0x10000)) |
+    FFLAGS += cat - $(ELFFILE).bin tmp.bin |
+    FFLAGS += head -c $$((0x400000)) > $(BINDIR)/esp32flash.bin && rm tmp.bin &&
+    FFLAGS += cp $(RIOTCPU)/$(CPU)/bin/rom_0x3ff90000_0x00010000.bin $(BINDIR)/rom1.bin &&
+    FFLAGS += cp $(RIOTCPU)/$(CPU)/bin/rom_0x40000000_0x000c2000.bin $(BINDIR)/rom.bin
 else
    export PROGRAMMER_SPEED ?= 460800
-    export FLASHER = $(ESPTOOL)
-    export FFLAGS += --chip esp32 -p $(PORT) -b $(PROGRAMMER_SPEED)
-    export FFLAGS += --before default_reset --after hard_reset write_flash
-    export FFLAGS += -z -fm $(FLASH_MODE) -fs detect -ff $(FLASH_FREQ)
-    export FFLAGS += 0x1000 $(RIOTCPU)/$(CPU)/bin/bootloader.bin
-    export FFLAGS += 0x8000 $(BINDIR)/partitions.bin
-    export FFLAGS += 0x10000 $(ELFFILE).bin
+    FLASHER = $(ESPTOOL)
+    FFLAGS += --chip esp32 -p $(PORT) -b $(PROGRAMMER_SPEED)
+    FFLAGS += --before default_reset --after hard_reset write_flash
+    FFLAGS += -z -fm $(FLASH_MODE) -fs detect -ff $(FLASH_FREQ)
+    FFLAGS += 0x1000 $(RIOTCPU)/$(CPU)/bin/bootloader.bin
+    FFLAGS += 0x8000 $(BINDIR)/partitions.bin
+    FFLAGS += 0x10000 $(ELFFILE).bin
 endif
--- a/cpu/esp8266/Makefile.include
+++ b/cpu/esp8266/Makefile.include
@ -137,16 +137,16 @@ export FLASHDEPS  ?= preflash

 # flasher configuration
 ifeq ($(QEMU), 1)
-    export FLASHER = cat
-    export FFLAGS += $(ELFFILE)-0x00000.bin /dev/zero | head -c $$((0x10000)) | cat -
-    export FFLAGS += $(ELFFILE)-0x10000.bin /dev/zero | head -c $$((0xfc000)) | cat -
-    export FFLAGS += $(RIOTCPU)/$(CPU)/bin/esp_init_data_default.bin > $(ELFFILE).bin
+    FLASHER = cat
+    FFLAGS += $(ELFFILE)-0x00000.bin /dev/zero | head -c $$((0x10000)) | cat -
+    FFLAGS += $(ELFFILE)-0x10000.bin /dev/zero | head -c $$((0xfc000)) | cat -
+    FFLAGS += $(RIOTCPU)/$(CPU)/bin/esp_init_data_default.bin > $(ELFFILE).bin
 else
    FLASH_MODE ?= dout
    export PROGRAMMER_SPEED ?= 460800
-    export FLASHER = esptool.py
-    export FFLAGS += -p $(PORT) -b $(PROGRAMMER_SPEED) write_flash
-    export FFLAGS += -fm $(FLASH_MODE)
-    export FFLAGS += 0 $(ELFFILE)-0x00000.bin
-    export FFLAGS += 0x10000 $(ELFFILE)-0x10000.bin; esptool.py -p $(PORT) run
+    FLASHER = esptool.py
+    FFLAGS += -p $(PORT) -b $(PROGRAMMER_SPEED) write_flash
+    FFLAGS += -fm $(FLASH_MODE)
+    FFLAGS += 0 $(ELFFILE)-0x00000.bin
+    FFLAGS += 0x10000 $(ELFFILE)-0x10000.bin; esptool.py -p $(PORT) run
 endif
--- a/makefiles/tools/bossa.inc.mk
+++ b/makefiles/tools/bossa.inc.mk
@ -1,5 +1,5 @@
-export FLASHER ?= $(RIOTTOOLS)/bossa/bossac
-export FFLAGS  ?= -p $(PORT) -e -i -w -v -b -R $(HEXFILE)
+FLASHER ?= $(RIOTTOOLS)/bossa/bossac
+FFLAGS  ?= -p $(PORT) -e -i -w -v -b -R $(HEXFILE)

 HEXFILE = $(BINFILE)

--- a/makefiles/tools/jlink.inc.mk
+++ b/makefiles/tools/jlink.inc.mk
@ -1,11 +1,11 @@
-export FLASHER = $(RIOTTOOLS)/jlink/jlink.sh
+FLASHER = $(RIOTTOOLS)/jlink/jlink.sh
 export DEBUGGER = $(RIOTTOOLS)/jlink/jlink.sh
 export DEBUGSERVER = $(RIOTTOOLS)/jlink/jlink.sh
 export RESET = $(RIOTTOOLS)/jlink/jlink.sh

 FLASHFILE ?= $(BINFILE)

-export FFLAGS ?= flash $(FLASHFILE)
+FFLAGS ?= flash $(FLASHFILE)
 export DEBUGGER_FLAGS ?= debug $(ELFFILE)
 export DEBUGSERVER_FLAGS ?= debug-server
 export RESET_FLAGS ?= reset
--- a/makefiles/tools/openocd.inc.mk
+++ b/makefiles/tools/openocd.inc.mk
@ -1,10 +1,10 @@
-export FLASHER ?= $(RIOTTOOLS)/openocd/openocd.sh
+FLASHER ?= $(RIOTTOOLS)/openocd/openocd.sh
 export DEBUGGER = $(RIOTTOOLS)/openocd/openocd.sh
 export DEBUGSERVER = $(RIOTTOOLS)/openocd/openocd.sh
 export RESET ?= $(RIOTTOOLS)/openocd/openocd.sh

 FLASHFILE ?= $(ELFFILE)
-export FFLAGS ?= flash $(FLASHFILE)
+FFLAGS ?= flash $(FLASHFILE)
 export DEBUGGER_FLAGS ?= debug $(ELFFILE)
 export DEBUGSERVER_FLAGS ?= debug-server
 export RESET_FLAGS ?= reset
--- a/makefiles/tools/pyocd.inc.mk
+++ b/makefiles/tools/pyocd.inc.mk
@ -1,10 +1,10 @@
-export FLASHER ?= $(RIOTBASE)/dist/tools/pyocd/pyocd.sh
+FLASHER ?= $(RIOTBASE)/dist/tools/pyocd/pyocd.sh
 export DEBUGGER = $(RIOTBASE)/dist/tools/pyocd/pyocd.sh
 export DEBUGSERVER = $(RIOTBASE)/dist/tools/pyocd/pyocd.sh
 export RESET ?= $(RIOTBASE)/dist/tools/pyocd/pyocd.sh

 export OFLAGS ?= -O ihex
-export FFLAGS ?= flash $(HEXFILE)
+FFLAGS ?= flash $(HEXFILE)
 export DEBUGGER_FLAGS ?= debug $(ELFFILE)
 export DEBUGSERVER_FLAGS ?= debug-server
 export RESET_FLAGS ?= reset
--- a/makefiles/tools/uniflash.inc.mk
+++ b/makefiles/tools/uniflash.inc.mk
@ -4,8 +4,8 @@ FLASHFILE ?= $(ELFFILE)
 export UNIFLASH_PATH ?= "UNIFLASH_PATH unconfigured"
 # check which uniflash version is available, either 4.x or 3.x
 ifneq ("$(wildcard $(UNIFLASH_PATH)/dslite.sh)","")
-  export FLASHER ?= $(UNIFLASH_PATH)/dslite.sh
-  export FFLAGS  = --config $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml $(FLASHFILE)
+  FLASHER ?= $(UNIFLASH_PATH)/dslite.sh
+  FFLAGS  = --config $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml $(FLASHFILE)
  # configure uniflash for resetting target
  # xds110reset path changed in version UniFlash v4.4.0
  # Try to detect the newest one and fallback to only 'xds110reset'
@ -15,8 +15,8 @@ ifneq ("$(wildcard $(UNIFLASH_PATH)/dslite.sh)","")
  export RESET = $(XDS110RESET)
  export RESET_FLAGS
 else
-  export FLASHER = $(UNIFLASH_PATH)/uniflash.sh
-  export FFLAGS  = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -program $(FLASHFILE)
+  FLASHER = $(UNIFLASH_PATH)/uniflash.sh
+  FFLAGS  = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -program $(FLASHFILE)
  # configure uniflash for resetting target
  export RESET = $(UNIFLASH_PATH)/uniflash.sh
  export RESET_FLAGS = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -reset
--- a/makefiles/vars.inc.mk
+++ b/makefiles/vars.inc.mk
@ -69,8 +69,8 @@ export WERROR                # Treat all compiler warnings as errors if set to 1

 export GITCACHE              # path to git-cache executable
 export GIT_CACHE_DIR         # path to git-cache cache directory
-export FLASHER               # The command to call on "make flash".
-export FFLAGS                # The parameters to supply to FLASHER.
+# FLASHER                    # The command to call on "make flash".
+# FFLAGS                     # The parameters to supply to FLASHER.
 export FLASH_ADDR            # Define an offset to flash code into ROM memory.
 # TERMPROG                   # The command to call on "make term".
 # TERMFLAGS                  # Additional parameters to supply to TERMPROG.