From 79280eb12e3768ea1ca5b83b89271667178ff53b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= <gaetan.harter@fu-berlin.de>
Date: Fri, 17 May 2019 13:52:34 +0200
Subject: [PATCH] boards/tools: remove exporting PREFLASH/FLASHDEPS

PREFLASHER/PREFFLAGS/FLASHDEPS are evaluated by the main Makefile.include.
Their value does not need to be exported.

Testing
-------

`git diff --word-diff` only reports `export` being removed.

`git show --stat` reports `16 insertions(+), 16 deletions(-)`
Which is the same amount as lines that where matching
`export[[:blank::]]\+VARIABLE` plus the newline that is said to have
changed.
---
 cpu/esp32/Makefile.include   | 24 ++++++++++++------------
 cpu/esp8266/Makefile.include |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cpu/esp32/Makefile.include b/cpu/esp32/Makefile.include
index 922bac0c43..2194541f16 100644
--- a/cpu/esp32/Makefile.include
+++ b/cpu/esp32/Makefile.include
@@ -145,19 +145,19 @@ LINKFLAGS += -Wl,--warn-unresolved-symbols
 FLASH_MODE ?= dout  # FIX configuration, DO NOT CHANGE
 FLASH_FREQ  = 40m   # FIX configuration, DO NOT CHANGE
 FLASH_SIZE ?= 2MB
-export PREFLASHER = $(ESPTOOL)
-export PREFFLAGS  = --chip esp32 elf2image
-export PREFFLAGS += -fm $(FLASH_MODE) -fs $(FLASH_SIZE) -ff $(FLASH_FREQ)
-export PREFFLAGS += -o $(ELFFILE).bin $(ELFFILE);
-export PREFFLAGS += echo "" > $(BINDIR)/partitions.csv;
-export PREFFLAGS += echo "nvs, data, nvs, 0x9000, 0x6000" >> $(BINDIR)/partitions.csv;
-export PREFFLAGS += echo "phy_init, data, phy, 0xf000, 0x1000" >> $(BINDIR)/partitions.csv;
-export PREFFLAGS += echo -n "factory, app, factory, 0x10000, " >> $(BINDIR)/partitions.csv;
-export PREFFLAGS += ls -l $(ELFFILE).bin | awk '{ print $$5 }' >> $(BINDIR)/partitions.csv;
+PREFLASHER = $(ESPTOOL)
+PREFFLAGS  = --chip esp32 elf2image
+PREFFLAGS += -fm $(FLASH_MODE) -fs $(FLASH_SIZE) -ff $(FLASH_FREQ)
+PREFFLAGS += -o $(ELFFILE).bin $(ELFFILE);
+PREFFLAGS += echo "" > $(BINDIR)/partitions.csv;
+PREFFLAGS += echo "nvs, data, nvs, 0x9000, 0x6000" >> $(BINDIR)/partitions.csv;
+PREFFLAGS += echo "phy_init, data, phy, 0xf000, 0x1000" >> $(BINDIR)/partitions.csv;
+PREFFLAGS += echo -n "factory, app, factory, 0x10000, " >> $(BINDIR)/partitions.csv;
+PREFFLAGS += ls -l $(ELFFILE).bin | awk '{ print $$5 }' >> $(BINDIR)/partitions.csv;
 
-export PREFFLAGS += python $(RIOTCPU)/$(CPU)/gen_esp32part.py --disable-sha256sum
-export PREFFLAGS += --verify $(BINDIR)/partitions.csv $(BINDIR)/partitions.bin
-export FLASHDEPS  = preflash
+PREFFLAGS += python $(RIOTCPU)/$(CPU)/gen_esp32part.py --disable-sha256sum
+PREFFLAGS += --verify $(BINDIR)/partitions.csv $(BINDIR)/partitions.bin
+FLASHDEPS  = preflash
 
 # flasher configuration
 ifeq ($(QEMU), 1)
diff --git a/cpu/esp8266/Makefile.include b/cpu/esp8266/Makefile.include
index 316d2181cb..01d2885d2c 100644
--- a/cpu/esp8266/Makefile.include
+++ b/cpu/esp8266/Makefile.include
@@ -131,9 +131,9 @@ LINKFLAGS += -Wl,--warn-unresolved-symbols
 
 # configure preflasher to convert .elf to .bin before flashing
 FLASH_SIZE = -fs 8m
-export PREFLASHER ?= esptool.py
-export PREFFLAGS  ?= elf2image $(FLASH_SIZE) $(ELFFILE)
-export FLASHDEPS  ?= preflash
+PREFLASHER ?= esptool.py
+PREFFLAGS  ?= elf2image $(FLASH_SIZE) $(ELFFILE)
+FLASHDEPS  ?= preflash
 
 # flasher configuration
 ifeq ($(QEMU), 1)