From c48b34f54073bbcfda8990915a75029ab03497ca Mon Sep 17 00:00:00 2001
From: Oleg Hahm <oleg@hobbykeller.org>
Date: Fri, 3 Jan 2014 18:45:07 +0100
Subject: [PATCH] use proper variables in board Makefiles

---
 boards/chronos/Makefile.include         | 2 +-
 boards/mbed_lpc1768/Makefile.include    | 2 +-
 boards/msb-430-common/Makefile.include  | 2 +-
 boards/msba2-common/Makefile.include    | 4 ++--
 boards/redbee-econotag/Makefile.include | 2 +-
 boards/telosb/Makefile.include          | 2 +-
 boards/wsn430-common/Makefile.include   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include
index a034ee2409..bf2869c5f7 100644
--- a/boards/chronos/Makefile.include
+++ b/boards/chronos/Makefile.include
@@ -16,7 +16,7 @@ export SIZE = $(PREFIX)size
 export OBJCOPY = $(PREFIX)objcopy
 export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)startup.o
 export FLASHER = mspdebug
-export HEXFILE = bin/$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(PROJECT).hex
 export USEMODULE += msp430_common
 export FFLAGS = rf2500 "prog $(HEXFILE)"
 export OFLAGS = -O ihex
diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include
index 48f3b63bb4..d750209409 100644
--- a/boards/mbed_lpc1768/Makefile.include
+++ b/boards/mbed_lpc1768/Makefile.include
@@ -17,7 +17,7 @@ LINKFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,--cref -lc -lgcc -lnosys -
 ifeq ($(strip $(PORT)),)
 	export PORT = /dev/ttyUSB0
 endif
-export HEXFILE = bin/$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(PROJECT).hex
 export FFLAGS = $(HEXFILE)
 
 export ELFFILE = bin/$(PROJECT).elf
diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include
index 3fc5dc1c4e..57b5e6e053 100644
--- a/boards/msb-430-common/Makefile.include
+++ b/boards/msb-430-common/Makefile.include
@@ -14,7 +14,7 @@ export SIZE = $(PREFIX)size
 export OBJCOPY = $(PREFIX)objcopy
 export LINKFLAGS = -mmcu=$(MCU) -lgcc
 TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py
-export HEXFILE = bin/$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(PROJECT).hex
 
 
 ifeq ($(strip $(FLASHER)),)
diff --git a/boards/msba2-common/Makefile.include b/boards/msba2-common/Makefile.include
index 5ce4335a00..a0a4937c91 100644
--- a/boards/msba2-common/Makefile.include
+++ b/boards/msba2-common/Makefile.include
@@ -19,8 +19,8 @@ LINKFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)
 ifeq ($(strip $(PORT)),)
 	export PORT = /dev/ttyUSB0
 endif
-export HEXFILE = bin/$(PROJECT).hex
-export FFLAGS = $(PORT) $(BINDIR)$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(PROJECT).hex
+export FFLAGS = $(PORT) $(HEXFILE)
 include $(RIOTBOARD)/msba2-common/Makefile.dep
 
 export INCLUDES += -I$(RIOTBOARD)/msba2-common/include -I$(RIOTBOARD)/msba2-common/drivers/include
diff --git a/boards/redbee-econotag/Makefile.include b/boards/redbee-econotag/Makefile.include
index b9fe5ddfcf..e21f45ba00 100644
--- a/boards/redbee-econotag/Makefile.include
+++ b/boards/redbee-econotag/Makefile.include
@@ -24,7 +24,7 @@ LINKFLAGS = -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU
 ifeq ($(strip $(PORT)),)
 	export PORT = /dev/ttyUSB0
 endif
-export HEXFILE = bin/$(PROJECT).hex
+export HEXFILE = $(BINDIR)/$(PROJECT).hex
 export FFLAGS = -t $(PORT) -f $(HEXFILE) -c 'bbmc -l redbee-econotag reset'
 export OFLAGS = -O binary --gap-fill=0xff
 
diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include
index bd985e9338..343d741408 100644
--- a/boards/telosb/Makefile.include
+++ b/boards/telosb/Makefile.include
@@ -19,7 +19,7 @@ export FLASHER = goodfet.bsl
 ifeq ($(strip $(PORT)),)
     export PORT = /dev/ttyUSB0
 endif
-export HEXFILE = bin/$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(PROJECT).hex
 export FFLAGS = --telosb -c $(PORT) -r -e -I -p $(HEXFILE)
 
 export INCLUDES += -I $(RIOTCPU)/msp430-common/include -I$(RIOTBOARD)/$(BOARD)/include -I$(RIOTBASE)/drivers/cc2420/include -I$(RIOTBASE)/sys/net/include
diff --git a/boards/wsn430-common/Makefile.include b/boards/wsn430-common/Makefile.include
index 0bbd9e8f1d..dadc60bc65 100644
--- a/boards/wsn430-common/Makefile.include
+++ b/boards/wsn430-common/Makefile.include
@@ -17,7 +17,7 @@ export FLASHER = mspdebug
 ifeq ($(strip $(PORT)),)
     export PORT = /dev/ttyUSB0
 endif
-export HEXFILE = bin/$(PROJECT).hex
+export HEXFILE = $(BINDIR)$(PROJECT).hex
 export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)"
 
 export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include
-- 
GitLab