From 1608fd1570cfc99b42e58cb079bc291ac3a9435c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= Date: Tue, 10 Jun 2014 03:28:13 +0200 Subject: [PATCH] make: remove local definitions of (ELF|HEX)FILE We have sane defaults for `ELFFILE` and `HEXFILE` in the root `Makefile.include`. The local definition for `ELFFILE` of mbed_lpc1768's `Makefile.include` was wrong, which caused e.g. `make buildsize` to fail. --- boards/chronos/Makefile.include | 1 - boards/mbed_lpc1768/Makefile.include | 2 -- boards/msb-430-common/Makefile.include | 1 - boards/msba2-common/Makefile.include | 1 - boards/redbee-econotag/Makefile.include | 1 - boards/telosb/Makefile.include | 1 - boards/wsn430-common/Makefile.include | 1 - boards/z1/Makefile.include | 1 - 8 files changed, 9 deletions(-) diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include index 5289a39000..55f902c367 100644 --- a/boards/chronos/Makefile.include +++ b/boards/chronos/Makefile.include @@ -16,7 +16,6 @@ export SIZE = $(PREFIX)size export OBJCOPY = $(PREFIX)objcopy export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)msp430_common/startup.o export FLASHER = mspdebug -export HEXFILE = $(BINDIR)$(APPLICATION).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 668c6e8cde..d495aa89f7 100644 --- a/boards/mbed_lpc1768/Makefile.include +++ b/boards/mbed_lpc1768/Makefile.include @@ -17,10 +17,8 @@ LINKFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,--cref -lc -lgcc -lnosys - ifeq ($(strip $(PORT)),) export PORT = /dev/ttyUSB0 endif -export HEXFILE = $(BINDIR)$(APPLICATION).hex export FFLAGS = $(HEXFILE) -export ELFFILE = bin/$(APPLICATION).elf export DEBUGGER_FLAGS = $(ELFFILE) export INCLUDES += -I$(RIOTBOARD)/$(BOARD)/include/ -I$(RIOTCPU)/$(CPU)/include diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include index fd041ac834..8d0455ddca 100644 --- a/boards/msb-430-common/Makefile.include +++ b/boards/msb-430-common/Makefile.include @@ -14,7 +14,6 @@ export SIZE = $(PREFIX)size export OBJCOPY = $(PREFIX)objcopy export LINKFLAGS = -mmcu=$(MCU) -lgcc TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm.py -export HEXFILE = $(BINDIR)$(APPLICATION).hex export FLASHER ?= mspdebug export PORT ?= /dev/ttyUSB0 diff --git a/boards/msba2-common/Makefile.include b/boards/msba2-common/Makefile.include index 6dec003d4d..77d96a4e58 100644 --- a/boards/msba2-common/Makefile.include +++ b/boards/msba2-common/Makefile.include @@ -19,7 +19,6 @@ LINKFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE) ifeq ($(strip $(PORT)),) export PORT = /dev/ttyUSB0 endif -export HEXFILE = $(BINDIR)$(APPLICATION).hex export FFLAGS = $(PORT) $(HEXFILE) include $(RIOTBOARD)/msba2-common/Makefile.dep diff --git a/boards/redbee-econotag/Makefile.include b/boards/redbee-econotag/Makefile.include index 9e65dea93d..156c890f6d 100644 --- a/boards/redbee-econotag/Makefile.include +++ b/boards/redbee-econotag/Makefile.include @@ -24,7 +24,6 @@ LINKFLAGS = -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU ifeq ($(strip $(PORT)),) export PORT = /dev/ttyUSB0 endif -export HEXFILE = $(BINDIR)/$(APPLICATION).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 174ea8f173..f12f1d35bd 100644 --- a/boards/telosb/Makefile.include +++ b/boards/telosb/Makefile.include @@ -19,7 +19,6 @@ export FLASHER = goodfet.bsl ifeq ($(strip $(PORT)),) export PORT = /dev/ttyUSB0 endif -export HEXFILE = $(BINDIR)$(APPLICATION).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 fd182fd80b..6c15fdf6b7 100644 --- a/boards/wsn430-common/Makefile.include +++ b/boards/wsn430-common/Makefile.include @@ -17,7 +17,6 @@ export FLASHER = mspdebug ifeq ($(strip $(PORT)),) export PORT = /dev/ttyUSB0 endif -export HEXFILE = $(BINDIR)$(APPLICATION).hex export FFLAGS = -d $(PORT) -j uif "prog $(HEXFILE)" export INCLUDES += -I$(RIOTBOARD)/wsn430-common/include diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include index eb4a5023f6..53c115d447 100644 --- a/boards/z1/Makefile.include +++ b/boards/z1/Makefile.include @@ -19,7 +19,6 @@ export FLASHER = goodfet.bsl ifeq ($(strip $(PORT)),) export PORT = /dev/ttyUSB0 endif -export HEXFILE = $(BINDIR)$(APPLICATION).hex export FFLAGS = --z1 -I -c $(PORT) -r -e -p $(HEXFILE) export OFLAGS = -O ihex