boards/tools: remove exporting DEBUG*

DEBUGGER/DEBUGGER_FLAGS/DEBUGSERVER/DEBUGSERVER_FLAGS are evaluated by the main Makefile.include or by file included by it. Their value does not need to be exported. Testing ------- `git diff --word-diff` only reports `export` being removed. `git show --stat` reports `55 insertions(+), 55 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 · 7306dbd382
commit 7306dbd382
parent 734410b9cd
18 changed files with 55 additions and 55 deletions
--- a/boards/calliope-mini/Makefile.include
+++ b/boards/calliope-mini/Makefile.include
@ -11,11 +11,11 @@ PROGRAMMER ?= fscopy

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

  FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
-  export DEBUGGER =
-  export DEBUGSERVER =
+  DEBUGGER =
+  DEBUGSERVER =
 else ifeq (openocd,$(PROGRAMMER))
  DEBUG_ADAPTER = dap
 else ifeq (pyocd,$(PROGRAMMER))
--- a/boards/cc2538dk/Makefile.include
+++ b/boards/cc2538dk/Makefile.include
@ -15,8 +15,8 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 include $(RIOTMAKE)/tools/renode.inc.mk

 # debugger config
-export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
-export DEBUGSERVER = JLinkGDBServer -device CC2538SF53
+DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
+DEBUGSERVER = JLinkGDBServer -device CC2538SF53
 RESET = $(RIOTBOARD)/$(BOARD)/dist/reset.sh

 # Define the flash-tool and default port:
@ -32,7 +32,7 @@ endif

 OFLAGS = --gap-fill 0xff
 FLASHFILE ?= $(BINFILE)
-export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
+DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
 RESET_FLAGS = $(BINDIR)

 export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb
--- a/boards/common/msb-430/Makefile.include
+++ b/boards/common/msb-430/Makefile.include
@ -18,10 +18,10 @@ FLASHER ?= mspdebug
 FFLAGS = $(MSPDEBUGFLAGS) "prog $(HEXFILE)"

 # setup debugger
-export DEBUGSERVER = $(FLASHER)
-export DEBUGSERVER_FLAGS = $(MSPDEBUGFLAGS) gdb
-export DEBUGGER = $(PREFIX)gdb
-export DEBUGGER_FLAGS = --tui --ex="target remote localhost:2000" --ex "monitor reset halt" --ex load -ex "monitor reset halt"  $(ELFFILE)
+DEBUGSERVER = $(FLASHER)
+DEBUGSERVER_FLAGS = $(MSPDEBUGFLAGS) gdb
+DEBUGGER = $(PREFIX)gdb
+DEBUGGER_FLAGS = --tui --ex="target remote localhost:2000" --ex "monitor reset halt" --ex load -ex "monitor reset halt"  $(ELFFILE)

 # export common msb-430 includes
 export INCLUDES += -I$(RIOTBOARD)/common/msb-430/include
--- a/boards/common/remote/Makefile.include
+++ b/boards/common/remote/Makefile.include
@ -18,15 +18,15 @@ ifeq ($(PROGRAMMER),cc2538-bsl)
 else ifeq ($(PROGRAMMER),jlink)
  FLASHER = $(RIOTBOARD)/common/remote/dist/flash.sh
  FFLAGS  = $(BINDIR) $(FLASHFILE)
-  export DEBUGGER = $(RIOTBOARD)/common/remote/dist/debug.sh
-  export DEBUGSERVER = JLinkGDBServer -device CC2538SF53
+  DEBUGGER = $(RIOTBOARD)/common/remote/dist/debug.sh
+  DEBUGSERVER = JLinkGDBServer -device CC2538SF53
  RESET = $(RIOTBOARD)/common/remote/dist/reset.sh
  RESET_FLAGS = $(BINDIR)
 endif

 OFLAGS = --gap-fill 0xff
 FLASHFILE ?= $(BINFILE)
-export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
+DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
 export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb

 # include common remote includes
--- a/boards/common/stm32f103c8/Makefile.include
+++ b/boards/common/stm32f103c8/Makefile.include
@ -24,7 +24,7 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 ifeq ($(PROGRAMMER),dfu-util)
  export ROM_OFFSET ?= 0x2000 # Skip the space needed by the embedded bootloader
  FLASHER = dfu-util
-  export DEBUGGER = # no debugger
+  DEBUGGER = # no debugger
  RESET = # dfu-util has no support for resetting the device

  HEXFILE = $(BINFILE)
--- a/boards/f4vi1/Makefile.include
+++ b/boards/f4vi1/Makefile.include
@ -14,10 +14,10 @@ include $(RIOTMAKE)/tools/serial.inc.mk

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

 # define st-flash parameters
 HEXFILE = $(BINFILE)
 FFLAGS = write $(HEXFILE) 0x8000000
-export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(ELFFILE)
+DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(ELFFILE)
--- a/boards/mbed_lpc1768/Makefile.include
+++ b/boards/mbed_lpc1768/Makefile.include
@ -2,12 +2,12 @@
 export CPU = lpc1768

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

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

 # define the default port depending on the host OS
 PORT_LINUX ?= /dev/ttyACM0
--- a/boards/microbit/Makefile.include
+++ b/boards/microbit/Makefile.include
@ -11,11 +11,11 @@ PROGRAMMER ?= fscopy

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

  FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
-  export DEBUGGER =
-  export DEBUGSERVER =
+  DEBUGGER =
+  DEBUGSERVER =
 else ifeq (openocd,$(PROGRAMMER))
  # this board uses a daplink adapter by default
  DEBUG_ADAPTER = dap
--- a/boards/native/Makefile.include
+++ b/boards/native/Makefile.include
@ -35,9 +35,9 @@ else
 endif

 ifeq ($(shell uname -s),Darwin)
-  export DEBUGGER ?= lldb
+  DEBUGGER ?= lldb
 else
-  export DEBUGGER ?= gdb
+  DEBUGGER ?= gdb
 endif

 TERMPROG ?= $(ELFFILE)
@ -104,9 +104,9 @@ TERMFLAGS := $(PORT) $(TERMFLAGS)

 export ASFLAGS =
 ifeq ($(shell basename $(DEBUGGER)),lldb)
-  export DEBUGGER_FLAGS = -- $(ELFFILE) $(TERMFLAGS)
+  DEBUGGER_FLAGS = -- $(ELFFILE) $(TERMFLAGS)
 else
-  export DEBUGGER_FLAGS = -q --args $(ELFFILE) $(TERMFLAGS)
+  DEBUGGER_FLAGS = -q --args $(ELFFILE) $(TERMFLAGS)
 endif
 term-valgrind: export VALGRIND_FLAGS ?= \
 	--leak-check=full \
--- a/boards/nz32-sc151/Makefile.include
+++ b/boards/nz32-sc151/Makefile.include
@ -10,7 +10,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 export ID ?= 0483:df11

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

 HEXFILE = $(BINFILE)
--- a/boards/opencm904/Makefile.include
+++ b/boards/opencm904/Makefile.include
@ -4,12 +4,12 @@ export CPU_MODEL = stm32f103cb

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

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

 # define the default port depending on the host OS
 PORT_LINUX ?= /dev/ttyACM0
--- a/boards/openmote-b/Makefile.include
+++ b/boards/openmote-b/Makefile.include
@ -21,13 +21,13 @@ ifeq ($(PROGRAMMER),cc2538-bsl)
 else ifeq ($(PROGRAMMER),jlink)
  FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
  FFLAGS  = $(BINDIR) $(FLASHFILE)
-  export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
-  export DEBUGSERVER = JLinkGDBServer -device CC2538SF53
+  DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
+  DEBUGSERVER = JLinkGDBServer -device CC2538SF53
  RESET = $(RIOTBOARD)/$(BOARD)/dist/reset.sh
 endif

 FLASHFILE ?= $(BINFILE)
-export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
+DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
 RESET_FLAGS = $(BINDIR)
 export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb

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

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

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

 FLASHFILE ?= $(BINFILE)

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

 FLASHFILE ?= $(ELFFILE)
 FFLAGS ?= flash $(FLASHFILE)
-export DEBUGGER_FLAGS ?= debug $(ELFFILE)
-export DEBUGSERVER_FLAGS ?= debug-server
+DEBUGGER_FLAGS ?= debug $(ELFFILE)
+DEBUGSERVER_FLAGS ?= debug-server
 RESET_FLAGS ?= reset

 ifneq (,$(DEBUG_ADAPTER))
--- a/makefiles/tools/pyocd.inc.mk
+++ b/makefiles/tools/pyocd.inc.mk
@ -1,10 +1,10 @@
 FLASHER ?= $(RIOTBASE)/dist/tools/pyocd/pyocd.sh
-export DEBUGGER = $(RIOTBASE)/dist/tools/pyocd/pyocd.sh
-export DEBUGSERVER = $(RIOTBASE)/dist/tools/pyocd/pyocd.sh
+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)
-export DEBUGGER_FLAGS ?= debug $(ELFFILE)
-export DEBUGSERVER_FLAGS ?= debug-server
+DEBUGGER_FLAGS ?= debug $(ELFFILE)
+DEBUGSERVER_FLAGS ?= debug-server
 RESET_FLAGS ?= reset
--- a/makefiles/tools/uniflash.inc.mk
+++ b/makefiles/tools/uniflash.inc.mk
@ -22,9 +22,9 @@ else
  RESET_FLAGS = -ccxml $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).ccxml -reset
 endif
 # configure the debug server
-export DEBUGSERVER = $(UNIFLASH_PATH)/ccs_base/common/uscif/gdb_agent_console
-export DEBUGSERVER_FLAGS = -p 3333 $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).dat
+DEBUGSERVER = $(UNIFLASH_PATH)/ccs_base/common/uscif/gdb_agent_console
+DEBUGSERVER_FLAGS = -p 3333 $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_$(XDEBUGGER).dat

 # configure the debugging tool
-export DEBUGGER = $(PREFIX)gdb
-export DEBUGGER_FLAGS = -x $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_gdb.conf $(ELFFILE)
+DEBUGGER = $(PREFIX)gdb
+DEBUGGER_FLAGS = -x $(RIOTBOARD)/$(BOARD)/dist/$(CPU_MODEL)_gdb.conf $(ELFFILE)
--- a/makefiles/vars.inc.mk
+++ b/makefiles/vars.inc.mk
@ -78,10 +78,10 @@ export PORT                  # The port to connect the TERMPROG to.
 export ELFFILE               # The unstripped result of the compilation.
 export HEXFILE               # The stripped result of the compilation.
 # FLASHFILE                  # The output file used for flashing (transition phase: only if defined)
-export DEBUGGER              # The command to call on "make debug", usually a script starting the GDB front-end.
-export DEBUGGER_FLAGS        # The parameters to supply to DEBUGGER.
-export DEBUGSERVER           # The command to call on "make debug-server", usually a script starting the GDB server.
-export DEBUGSERVER_FLAGS     # The parameters to supply to DEBUGSERVER.
+# DEBUGGER                   # The command to call on "make debug", usually a script starting the GDB front-end.
+# DEBUGGER_FLAGS             # The parameters to supply to DEBUGGER.
+# DEBUGSERVER                # The command to call on "make debug-server", usually a script starting the GDB server.
+# DEBUGSERVER_FLAGS          # The parameters to supply to DEBUGSERVER.
 # RESET                      # The command to call on "make reset", this command resets/reboots the target.
 # RESET_FLAGS                # The parameters to supply to RESET.