deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

The .ihex file use the intermediate Contiki-wide .$(TARGET) target instead of the MSP430-specific .firmware

Browse source
This commit is contained in:
adamdunkels 2008-07-02 14:11:34 +00:00
parent 05454ce929
commit 7c459c849d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cpu/msp430/Makefile.msp430
View file

@ -1,4 +1,4 @@
# $Id: Makefile.msp430,v 1.23 2008/02/03 20:59:35 adamdunkels Exp $ # $Id: Makefile.msp430,v 1.24 2008/07/02 14:11:34 adamdunkels Exp $
ifdef nodeid ifdef nodeid
CFLAGS += -DNODEID=$(nodeid) CFLAGS += -DNODEID=$(nodeid)
@ -67,7 +67,7 @@ PROJECT_OBJECTFILES += ${addprefix $(OBJECTDIR)/,$(CONTIKI_TARGET_MAIN:.c=.o)}
%.firmware: %.co $(PROJECT_OBJECTFILES) contiki-$(TARGET).a %.firmware: %.co $(PROJECT_OBJECTFILES) contiki-$(TARGET).a
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(filter-out %.a,$^) $(filter %.a,$^) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(filter-out %.a,$^) $(filter %.a,$^)
%.ihex: %.firmware %.ihex: %.$(TARGET)
$(OBJCOPY) $^ -O ihex $@ $(OBJCOPY) $^ -O ihex $@
core-labels.o: core.firmware core-labels.o: core.firmware