From 559b072a59a8eab40620e71c6335bdba94cd3d35 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Fri, 17 Oct 2014 22:39:45 +0200 Subject: [PATCH] make: don't overwrite LINKFLAGS Fix the boards' Makefiles were a potentially set LINKFLAGS variable were overwritten. --- boards/chronos/Makefile.include | 2 +- boards/mbed_lpc1768/Makefile.include | 4 ++-- boards/msb-430-common/Makefile.include | 2 +- boards/msba2-common/Makefile.include | 2 +- boards/redbee-econotag/Makefile.include | 2 +- boards/telosb/Makefile.include | 2 +- boards/wsn430-common/Makefile.include | 2 +- boards/z1/Makefile.include | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/boards/chronos/Makefile.include b/boards/chronos/Makefile.include index 55f902c367..27d2d47f30 100644 --- a/boards/chronos/Makefile.include +++ b/boards/chronos/Makefile.include @@ -14,7 +14,7 @@ export AS = $(PREFIX)as export LINK = $(PREFIX)gcc export SIZE = $(PREFIX)size export OBJCOPY = $(PREFIX)objcopy -export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)msp430_common/startup.o +export LINKFLAGS += -mmcu=$(MCU) -lgcc $(BINDIR)msp430_common/startup.o export FLASHER = mspdebug export USEMODULE += msp430_common export FFLAGS = rf2500 "prog $(HEXFILE)" diff --git a/boards/mbed_lpc1768/Makefile.include b/boards/mbed_lpc1768/Makefile.include index d495aa89f7..9f13d89423 100644 --- a/boards/mbed_lpc1768/Makefile.include +++ b/boards/mbed_lpc1768/Makefile.include @@ -11,8 +11,8 @@ export AS = $(PREFIX)as export LINK = $(PREFIX)gcc export SIZE = $(PREFIX)size export OBJCOPY = $(PREFIX)objcopy -#LINKFLAGS = -g3 -ggdb -mcpu=cortex-m3 $(FPU_USAGE) -mlittle-endian -static -lgcc -mthumb -mthumb-interwork -nostartfiles -T$(RIOTCPU)/$(CPU)/LPC1768.ld -LINKFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,--cref -lc -lgcc -lnosys -T$(RIOTCPU)/$(CPU)/LPC1768.ld -nostartfiles +#LINKFLAGS += -g3 -ggdb -mcpu=cortex-m3 $(FPU_USAGE) -mlittle-endian -static -lgcc -mthumb -mthumb-interwork -nostartfiles -T$(RIOTCPU)/$(CPU)/LPC1768.ld +LINKFLAGS += -mcpu=cortex-m3 -mthumb -Wl,--gc-sections,--cref -lc -lgcc -lnosys -T$(RIOTCPU)/$(CPU)/LPC1768.ld -nostartfiles ifeq ($(strip $(PORT)),) export PORT = /dev/ttyUSB0 diff --git a/boards/msb-430-common/Makefile.include b/boards/msb-430-common/Makefile.include index fdfcad9333..784af7d9c2 100644 --- a/boards/msb-430-common/Makefile.include +++ b/boards/msb-430-common/Makefile.include @@ -12,7 +12,7 @@ export AS = $(PREFIX)as export LINK = $(PREFIX)gcc export SIZE = $(PREFIX)size export OBJCOPY = $(PREFIX)objcopy -export LINKFLAGS = -mmcu=$(MCU) -lgcc +export LINKFLAGS += -mmcu=$(MCU) -lgcc TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm export FLASHER ?= mspdebug diff --git a/boards/msba2-common/Makefile.include b/boards/msba2-common/Makefile.include index 7f5c5775fb..355cd8417c 100644 --- a/boards/msba2-common/Makefile.include +++ b/boards/msba2-common/Makefile.include @@ -14,7 +14,7 @@ export SIZE = $(PREFIX)size export OBJCOPY = $(PREFIX)objcopy FLASHER = lpc2k_pgm TERMPROG ?= $(RIOTBASE)/dist/tools/pyterm/pyterm -LINKFLAGS = -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU)/linkerscript.x +LINKFLAGS += -gdwarf-2 -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU)/linkerscript.x ifeq ($(strip $(PORT)),) export PORT = /dev/ttyUSB0 diff --git a/boards/redbee-econotag/Makefile.include b/boards/redbee-econotag/Makefile.include index 56fec9cc04..2792fe6b65 100644 --- a/boards/redbee-econotag/Makefile.include +++ b/boards/redbee-econotag/Makefile.include @@ -19,7 +19,7 @@ export SIZE = $(PREFIX)size export OBJCOPY = $(PREFIX)objcopy FLASHER = mc1322x-load.pl TERM = pyterm -LINKFLAGS = -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU)/mc1322x.lds +LINKFLAGS += -mcpu=arm7tdmi-s -static -lgcc -nostartfiles -T$(RIOTBASE)/cpu/$(CPU)/mc1322x.lds ifeq ($(strip $(PORT)),) export PORT = /dev/ttyUSB0 diff --git a/boards/telosb/Makefile.include b/boards/telosb/Makefile.include index 0ec71cd2fb..90e7d1a682 100644 --- a/boards/telosb/Makefile.include +++ b/boards/telosb/Makefile.include @@ -13,7 +13,7 @@ export AS = $(PREFIX)as export LINK = $(PREFIX)gcc export SIZE = $(PREFIX)size export OBJCOPY = $(PREFIX)objcopy -export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)msp430_common/startup.o +export LINKFLAGS += -mmcu=$(MCU) -lgcc $(BINDIR)msp430_common/startup.o export TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm export FLASHER = $(RIOTBASE)/dist/tools/goodfet/goodfet.bsl ifeq ($(strip $(PORT)),) diff --git a/boards/wsn430-common/Makefile.include b/boards/wsn430-common/Makefile.include index 6c15fdf6b7..439e8958f0 100644 --- a/boards/wsn430-common/Makefile.include +++ b/boards/wsn430-common/Makefile.include @@ -12,7 +12,7 @@ export AS = $(PREFIX)as export LINK = $(PREFIX)gcc export SIZE = $(PREFIX)size export OBJCOPY = $(PREFIX)objcopy -export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)msp430_common/startup.o +export LINKFLAGS += -mmcu=$(MCU) -lgcc $(BINDIR)msp430_common/startup.o export FLASHER = mspdebug ifeq ($(strip $(PORT)),) export PORT = /dev/ttyUSB0 diff --git a/boards/z1/Makefile.include b/boards/z1/Makefile.include index e40c829634..cc57b5bbcd 100644 --- a/boards/z1/Makefile.include +++ b/boards/z1/Makefile.include @@ -13,7 +13,7 @@ export AS = $(PREFIX)as export LINK = $(PREFIX)gcc export SIZE = $(PREFIX)size export OBJCOPY = $(PREFIX)objcopy -export LINKFLAGS = -mmcu=$(MCU) -lgcc $(BINDIR)msp430_common/startup.o +export LINKFLAGS += -mmcu=$(MCU) -lgcc $(BINDIR)msp430_common/startup.o export TERMPROG = $(RIOTBASE)/dist/tools/pyterm/pyterm export FLASHER = $(RIOTBASE)/dist/tools/goodfet/goodfet.bsl ifeq ($(strip $(PORT)),)