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

improved support for IAR compiler for z1

Browse source
This commit is contained in:
Joakim Eriksson 2011-06-05 00:21:47 +02:00
parent d980c0db16
commit af601dfb23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cpu/msp430/Makefile.msp430
View file

@ -41,7 +41,7 @@ IAR_PATH_C = $(shell dirname "$(IAR_BIN_PATH)")
IAR_PATH = $(shell cygpath -m "$(IAR_PATH_C)") IAR_PATH = $(shell cygpath -m "$(IAR_PATH_C)")
endif endif
CFLAGSNO = --dlib_config "$(IAR_PATH)/LIB/DLIB/dl430xlfn.h" -Ohz --multiplier=32 --multiplier_location=4C0 --hw_workaround=CPU40 --core=430X $(CFLAGSWERROR) --data_model small --double=32 CFLAGSNO = --dlib_config "$(IAR_PATH)/LIB/DLIB/dl430xlfn.h" $(CFLAGSWERROR)
# CFLAGSNO = --dlib_config $(IAR_PATH)/LIB/DLIB/dl430xlfn.h -Ohz --multiplier=32 --multiplier_location=4C0 --hw_workaround=CPU40 --core=430X $(CFLAGSWERROR) --data_model large --double=32 # CFLAGSNO = --dlib_config $(IAR_PATH)/LIB/DLIB/dl430xlfn.h -Ohz --multiplier=32 --multiplier_location=4C0 --hw_workaround=CPU40 --core=430X $(CFLAGSWERROR) --data_model large --double=32
CUSTOM_RULE_C_TO_O = 1 CUSTOM_RULE_C_TO_O = 1
%.o: %.c %.o: %.c
@ -56,8 +56,6 @@ CUSTOM_RULE_C_TO_CO = 1
$(CC) $(CFLAGS) -DAUTOSTART_ENABLE $< -o $@ $(CC) $(CFLAGS) -DAUTOSTART_ENABLE $< -o $@
AROPTS = -o AROPTS = -o
LDFLAGS += -B -xm "$(IAR_PATH)/lib/dlib/dl430xsfn.r43" -f "$(IAR_PATH)/config/lnk430f5437.xcl" -l contiki-$(TARGET).map -Fintel-extended -s __program_start -D_STACK_SIZE=80 -D_DATA16_HEAP_SIZE=80 -D_DATA20_HEAP_SIZE=80
else else
GCC = 1 GCC = 1

7
platform/z1/Makefile.common
View file

@ -7,7 +7,7 @@ CFLAGS+=-Os -g
endif endif
ifdef IAR ifdef IAR
CFLAGS+=-e --vla CFLAGS+=-e --vla -Ohz --multiplier=16s --core=430X --data_model small --double=32
endif endif
CLEAN += symbols.c symbols.h CLEAN += symbols.c symbols.h
@ -42,6 +42,11 @@ CONTIKI_TARGET_SOURCEFILES += contiki-z1-platform.c
MCU=msp430x2617 MCU=msp430x2617
include $(CONTIKI)/cpu/msp430/Makefile.msp430 include $(CONTIKI)/cpu/msp430/Makefile.msp430
# Add LDFLAGS after IAR_PATH is set
ifdef IAR
LDFLAGS += -B -xm "$(IAR_PATH)/lib/dlib/dl430xsfn.r43" -f "$(IAR_PATH)/config/lnk430f2617.xcl" -l contiki-$(TARGET).map -Fintel-extended -s __program_start -D_STACK_SIZE=80 -D_DATA16_HEAP_SIZE=80 -D_DATA20_HEAP_SIZE=80
endif
contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/,symbols.o} contiki-$(TARGET).a: ${addprefix $(OBJECTDIR)/,symbols.o}
# $(AR) rcf $@ $^ # $(AR) rcf $@ $^