Skip to content

Commit 83825b6

Browse files
committed
makefiles: remove unnecessary evaluations of PORT variable.
Remove instances of `:=` and export that were causing $(PORT) to be evaluated where it was not needed. This is needed for an incoming change that will verify if port is not set.
1 parent f0708d6 commit 83825b6

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

boards/cc2538dk/Makefile.include

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ export RESET = $(RIOTBOARD)/$(BOARD)/dist/reset.sh
2323
export PROGRAMMER ?= cc2538-bsl
2424

2525
ifeq ($(PROGRAMMER),cc2538-bsl)
26-
export FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
27-
export FFLAGS = -p "$(PORT)" -e -w -v $(HEXFILE)
26+
FLASHER = $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py
27+
FFLAGS = -p "$(PORT)" -e -w -v $(HEXFILE)
2828
else ifeq ($(PROGRAMMER),jlink)
29-
export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
30-
export FFLAGS = $(BINDIR) $(HEXFILE)
29+
FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
30+
FFLAGS = $(BINDIR) $(HEXFILE)
3131
endif
3232

3333
OFLAGS = --gap-fill 0xff

makefiles/murdock.inc.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
# (HACK) get actual flash binary from FFLAGS.
6-
FLASHFILE:=$(filter $(HEXFILE) $(ELFFILE:.elf=.bin) $(ELFFILE),$(FFLAGS))
6+
FLASHFILE = $(filter $(HEXFILE) $(ELFFILE:.elf=.bin) $(ELFFILE),$(FFLAGS))
77

88
#
99
# This target will run "make test" on the CI cluster.

makefiles/vars.inc.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export WERROR # Treat all compiler warnings as errors if set to 1
6969
export GITCACHE # path to git-cache executable
7070
export GIT_CACHE_DIR # path to git-cache cache directory
7171
export FLASHER # The command to call on "make flash".
72-
export FFLAGS # The parameters to supply to FLASHER.
72+
# FFLAGS # The parameters to supply to FLASHER.
7373
export FLASH_ADDR # Define an offset to flash code into ROM memory.
7474
# TERMPROG # The command to call on "make term".
7575
# TERMFLAGS # Additional parameters to supply to TERMPROG.

0 commit comments

Comments
 (0)