riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make: cleanup HEXFILE/ELFFILE/BINFILE

Browse Source 
* Use the existing variable when possible
* Remove duplicate definition
* Remove unused BINFILE variable
This commit is contained in:
Gaëtan Harter 2018-03-26 17:14:40 +02:00 committed by cladmi
parent 21a9958323
commit 72ddc72f2b
11 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/bluepill/Makefile.include
View File

@ -16,7 +16,6 @@ include $(RIOTMAKE)/tools/serial.inc.mk
# (ground) GPIO B1. # (ground) GPIO B1.
ifeq ($(PROGRAMMER),dfu-util) ifeq ($(PROGRAMMER),dfu-util)
export ROM_OFFSET ?= 0x2000 # Skip the space needed by the embedded bootloader export ROM_OFFSET ?= 0x2000 # Skip the space needed by the embedded bootloader
export BINFILE = $(patsubst %.elf,%.bin,$(ELFFILE))
export FLASHER = dfu-util export FLASHER = dfu-util
export DEBUGGER = # no debugger export DEBUGGER = # no debugger
export RESET = # dfu-util has no support for resetting the device export RESET = # dfu-util has no support for resetting the device

1
boards/calliope-mini/Makefile.include
View File

@ -13,7 +13,6 @@ include $(RIOTMAKE)/tools/serial.inc.mk
PROGRAMMER ?= fscopy PROGRAMMER ?= fscopy
ifeq (fscopy,$(PROGRAMMER)) ifeq (fscopy,$(PROGRAMMER))
export OFLAGS = -O ihex export OFLAGS = -O ihex
export HEXFILE = $(ELFFILE:.elf=.hex)
export FFLAGS = export FFLAGS =
export DEBUGGER_FLAGS = export DEBUGGER_FLAGS =

2
boards/common/arduino-atmega/Makefile.include
View File

@ -18,4 +18,4 @@ export DEBUGGER = $(DIST_PATH)/debug.sh $(DEBUGSERVER_FLAGS) $(DIST_PATH) $(DEBU
export PROGRAMMER_FLAGS = -P $(PORT) -b $(PROGRAMMER_SPEED) export PROGRAMMER_FLAGS = -P $(PORT) -b $(PROGRAMMER_SPEED)
export OFLAGS += -j .text -j .data -O ihex export OFLAGS += -j .text -j .data -O ihex
export FFLAGS += -c $(PROGRAMMER) $(PROGRAMMER_FLAGS) -F -D -U flash:w:bin/$(BOARD)/$(PROJECT)$(APPLICATION).hex export FFLAGS += -c $(PROGRAMMER) $(PROGRAMMER_FLAGS) -F -D -U flash:w:$(HEXFILE)

4
boards/f4vi1/Makefile.include
View File

@ -16,5 +16,5 @@ export DEBUGSERVER = st-util
# define st-flash parameters # define st-flash parameters
export OFLAGS = -O binary export OFLAGS = -O binary
export FFLAGS = write bin/$(BOARD)/$(APPLICATION).hex 0x8000000 export FFLAGS = write $(HEXFILE) 0x8000000
export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(BINDIR)/$(APPLICATION).elf export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(ELFFILE)

2
boards/mega-xplained/Makefile.include
View File

@ -21,4 +21,4 @@ export PROGRAMMER ?= buspirate
export PROGRAMMER_FLAGS = -P /dev/ttyUSB0 export PROGRAMMER_FLAGS = -P /dev/ttyUSB0
export OFLAGS += -j .text -j .data -O ihex export OFLAGS += -j .text -j .data -O ihex
export FFLAGS += -p m1284p -c $(PROGRAMMER) $(PROGRAMMER_FLAGS) -F -U flash:w:bin/$(BOARD)/$(PROJECT)$(APPLICATION).hex export FFLAGS += -p m1284p -c $(PROGRAMMER) $(PROGRAMMER_FLAGS) -F -U flash:w:$(HEXFILE)

1
boards/microbit/Makefile.include
View File

@ -13,7 +13,6 @@ include $(RIOTMAKE)/tools/serial.inc.mk
PROGRAMMER ?= fscopy PROGRAMMER ?= fscopy
ifeq (fscopy,$(PROGRAMMER)) ifeq (fscopy,$(PROGRAMMER))
export OFLAGS = -O ihex export OFLAGS = -O ihex
export HEXFILE = $(ELFFILE:.elf=.hex)
export FFLAGS = export FFLAGS =
export DEBUGGER_FLAGS = export DEBUGGER_FLAGS =

2
boards/nz32-sc151/Makefile.include
View File

@ -9,8 +9,6 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
# set the default id # set the default id
export ID ?= 0483:df11 export ID ?= 0483:df11
export BINFILE = $(patsubst %.elf,%.bin,$(ELFFILE))
export FLASHER = dfu-util export FLASHER = dfu-util
export DEBUGGER = # dfu-util has no debugger export DEBUGGER = # dfu-util has no debugger
export RESET = # dfu-util has no support for resetting the device export RESET = # dfu-util has no support for resetting the device

2
boards/spark-core/Makefile.include
View File

@ -7,8 +7,6 @@ PORT_LINUX ?= /dev/ttyUSB0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*))) PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
include $(RIOTMAKE)/tools/serial.inc.mk include $(RIOTMAKE)/tools/serial.inc.mk
export BINFILE = $(patsubst %.elf,%.bin,$(ELFFILE))
export FLASHER = dfu-util export FLASHER = dfu-util
export DEBUGGER = # spark core has no debugger export DEBUGGER = # spark core has no debugger
export RESET = # dfu-util has no support for resetting the device export RESET = # dfu-util has no support for resetting the device

1
boards/teensy31/Makefile.include
View File

@ -7,7 +7,6 @@ TEENSY_LOADER = $(RIOTBASE)/dist/tools/teensy-loader-cli/teensy_loader
FLASHER = $(TEENSY_LOADER) FLASHER = $(TEENSY_LOADER)
OFLAGS = -O ihex OFLAGS = -O ihex
HEXFILE = $(ELFFILE:.elf=.hex)
FFLAGS ?= --mcu=mk20dx256 $(HEXFILE) FFLAGS ?= --mcu=mk20dx256 $(HEXFILE)

2
boards/waspmote-pro/Makefile.include
View File

@ -34,4 +34,4 @@ ifeq ($(PROGRAMMER), stk500v1)
endif endif
export OFLAGS += -j .text -j .data -O ihex export OFLAGS += -j .text -j .data -O ihex
export FFLAGS += -p m1281 -c $(PROGRAMMER) $(PROGRAMMER_FLAGS) -F -U flash:w:bin/$(BOARD)/$(PROJECT)$(APPLICATION).hex export FFLAGS += -p m1281 -c $(PROGRAMMER) $(PROGRAMMER_FLAGS) -F -U flash:w:$(HEXFILE)

2
makefiles/info.inc.mk
View File

@ -18,7 +18,7 @@ info-objsize:
sort -rnk$${SORTROW} sort -rnk$${SORTROW}
info-buildsize: info-buildsize:
@$(SIZE) -d -B $(BINDIR)/$(APPLICATION).elf || echo '' @$(SIZE) -d -B $(ELFFILE) || echo ''
info-build: info-build:
@echo 'APPLICATION: $(APPLICATION)' @echo 'APPLICATION: $(APPLICATION)'