boards/makefiles: Remove '-Otype' from OFLAGS

* Remove '-Oihex' and '-Obinary' from OFLAGS for all boards
  It is now provided by the Makefile.include rule.

boards/bluepill/Makefile.include

@@ -20,8 +20,7 @@ ifeq ($(PROGRAMMER),dfu-util)
   export DEBUGGER = # no debugger
   export RESET = # dfu-util has no support for resetting the device
 
-  export OFLAGS = -O binary
-  HEXFILE = $(ELFFILE:.elf=.bin)
+  HEXFILE = $(BINFILE)
   export FFLAGS = -d 1d50:6017 -s 0x08002000:leave -D "$(HEXFILE)"
 else
 

boards/calliope-mini/Makefile.include

@@ -12,7 +12,6 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 # we support flashing through plain fscopy or using JLink
 PROGRAMMER ?= fscopy
 ifeq (fscopy,$(PROGRAMMER))
-  export OFLAGS = -O ihex
   export FFLAGS =
   export DEBUGGER_FLAGS =
 

boards/cc2538dk/Makefile.include

@@ -30,8 +30,8 @@ else ifeq ($(PROGRAMMER),jlink)
   export FFLAGS  = $(BINDIR) $(HEXFILE)
 endif
 
-export OFLAGS    = -O binary --gap-fill 0xff
-export HEXFILE = $(ELFFILE:.elf=.bin)
+OFLAGS = --gap-fill 0xff
+HEXFILE = $(BINFILE)
 export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
 export RESET_FLAGS = $(BINDIR)
 

boards/chronos/Makefile.include

@@ -3,7 +3,6 @@ export CPU = cc430
 export CPU_MODEL = cc430f6137
 
 # flasher configuration
-export OFLAGS = -O ihex
 export FLASHER = mspdebug
 export FFLAGS = rf2500 "prog $(HEXFILE)"
 

boards/common/arduino-atmega/Makefile.include

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

boards/common/msb-430/Makefile.include

@@ -9,7 +9,6 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 include $(RIOTMAKE)/tools/serial.inc.mk
 
 # setup flash tool
-export OFLAGS = -O ihex
 export PROGRAMMER ?= olimex
 export MSPDEBUGFLAGS += -j $(PROGRAMMER)
 ifeq ($(strip $(PROGRAMMER)),uif)

boards/common/msba2/Makefile.include

@@ -29,8 +29,6 @@ export FFLAGS = $(PORT) $(HEXFILE)
 INCLUDES += -I$(RIOTBOARD)/common/msba2/include
 INCLUDES += -I$(RIOTBOARD)/common/msba2/drivers/include
 
-export OFLAGS = -O ihex
-
 export UNDEF += $(BINDIR)/cpu/startup.o
 
 USEMODULE += boards_common_msba2-drivers

boards/common/remote/Makefile.include

@@ -22,8 +22,8 @@ else ifeq ($(PROGRAMMER),jlink)
   export RESET = $(RIOTBOARD)/$(BOARD)/dist/reset.sh
 endif
 
-export OFLAGS    = -O binary --gap-fill 0xff
-export HEXFILE = $(ELFFILE:.elf=.bin)
+OFLAGS = --gap-fill 0xff
+HEXFILE = $(BINFILE)
 export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
 export RESET_FLAGS = $(BINDIR)
 export OBJDUMPFLAGS += --disassemble --source --disassembler-options=force-thumb

boards/common/wsn430/Makefile.include

@@ -13,6 +13,5 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
 include $(RIOTMAKE)/tools/serial.inc.mk
 
 # configure the flash tool
-export OFLAGS = -O ihex
 export FLASHER = mspdebug
 export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"

boards/f4vi1/Makefile.include

@@ -15,7 +15,6 @@ export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
 export DEBUGSERVER = st-util
 
 # define st-flash parameters
-export OFLAGS = -O binary
-HEXFILE = $(ELFFILE:.elf=.bin)
+HEXFILE = $(BINFILE)
 export FFLAGS = write $(HEXFILE) 0x8000000
 export DEBUGGER_FLAGS = $(RIOTBOARD)/$(BOARD)/dist/gdb.conf $(ELFFILE)

boards/mbed_lpc1768/Makefile.include

@@ -5,8 +5,7 @@ export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/flash.sh
 export DEBUGGER =
 export DEBUGSERVER =
 
-export OFLAGS = -O binary
-export HEXFILE = $(ELFFILE:.elf=.bin)
+HEXFILE = $(BINFILE)
 export FFLAGS =
 export DEBUGGER_FLAGS =
 

boards/mega-xplained/Makefile.include

@@ -20,5 +20,5 @@ export PROGRAMMER ?= buspirate
 
 export PROGRAMMER_FLAGS = -P /dev/ttyUSB0
 
-export OFLAGS += -j .text -j .data -O ihex
+OFLAGS += -j .text -j .data
 export FFLAGS += -p m1284p -c $(PROGRAMMER) $(PROGRAMMER_FLAGS) -F -U flash:w:$(HEXFILE)

boards/microbit/Makefile.include

@@ -12,7 +12,6 @@ include $(RIOTMAKE)/tools/serial.inc.mk
 # we support flashing through plain fscopy or using JLink
 PROGRAMMER ?= fscopy
 ifeq (fscopy,$(PROGRAMMER))
-  export OFLAGS = -O ihex
   export FFLAGS =
   export DEBUGGER_FLAGS =
 

boards/mips-malta/Makefile.include

@@ -4,5 +4,4 @@ export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/
 export USE_DSP = 1
 export USE_UHI_SYSCALLS = 1
 
-OFLAGS = -Obinary
-HEXFILE = $(ELFFILE:.elf=.bin)
+HEXFILE = $(BINFILE)

boards/native/Makefile.include

@@ -25,12 +25,10 @@ ifneq ($(shell uname -s),Darwin)
 else
   ifeq (0,$(shell which gobjcopy 2>&1 > /dev/null ; echo $$?))
     export OBJCOPY ?= gobjcopy
-    export OFLAGS ?= -O ihex
   else
     # If gobjcopy is not available, just do nothing. The hexfile
     # is not used for native anyways.
     export OBJCOPY ?= true
-    export OFLAGS =
   endif
 endif
 

boards/nrf6310/Makefile.include

@@ -12,8 +12,7 @@ export DEBUGGER = $(RIOTBOARD)/$(BOARD)/dist/debug.sh
 export DEBUGSERVER = JLinkGDBServer -device nrf51822 -if SWD
 export RESET = $(RIOTBOARD)/$(BOARD)/dist/reset.sh
 
-export OFLAGS = -O binary
-export HEXFILE = $(ELFFILE:.elf=.bin)
+HEXFILE = $(BINFILE)
 export FFLAGS = $(BINDIR) $(HEXFILE)
 export DEBUGGER_FLAGS = $(BINDIR) $(ELFFILE)
 export RESET_FLAGS = $(BINDIR)

boards/nz32-sc151/Makefile.include

@@ -13,8 +13,7 @@ export FLASHER = dfu-util
 export DEBUGGER = # dfu-util has no debugger
 export RESET = # dfu-util has no support for resetting the device
 
-export OFLAGS = -O binary
-HEXFILE = $(ELFFILE:.elf=.bin)
+HEXFILE = $(BINFILE)
 export FFLAGS = -d $(ID) -a 0 -s 0x08000000:leave -D "$(HEXFILE)"
 export TERMFLAGS = -p $(PORT)
 

boards/opencm904/Makefile.include

@@ -7,8 +7,7 @@ export FLASHER = $(RIOTBOARD)/$(BOARD)/dist/robotis-loader.py
 export DEBUGGER =
 export DEBUGSERVER =
 
-export OFLAGS = -O binary
-export HEXFILE = $(ELFFILE:.elf=.bin)
+HEXFILE = $(BINFILE)
 export FFLAGS =
 export DEBUGGER_FLAGS =
 

boards/openmote-cc2538/Makefile.include

@@ -17,8 +17,7 @@ ifeq ($(PROGRAMMER),jlink)
   export TUI := 1
   include $(RIOTMAKE)/tools/jlink.inc.mk
 else
-  export OFLAGS = -O binary
-  export HEXFILE = $(ELFFILE:.elf=.bin)
+  HEXFILE = $(BINFILE)
   export FLASHER = $(RIOTBASE)/dist/tools/cc2538-bsl/cc2538-bsl.py
   export FFLAGS  = -p "$(PORT)" -e -w -v -b 460800 $(HEXFILE)
 endif

boards/spark-core/Makefile.include

@@ -11,8 +11,7 @@ export FLASHER = dfu-util
 export DEBUGGER = # spark core has no debugger
 export RESET = # dfu-util has no support for resetting the device
 
-export OFLAGS = -O binary
-HEXFILE = $(ELFFILE:.elf=.bin)
+HEXFILE = $(BINFILE)
 export FFLAGS = -d 1d50:607f -a 0 -s 0x08005000:leave -D "$(HEXFILE)"
 
 export INCLUDES += -I$(RIOTCPU)/$(CPU)/include/ -I$(RIOTBOARD)/$(BOARD)/include/