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

Be more explicit with the relationship between inheritance between MSP430 families.

Browse source
This commit is contained in:
Nicolas Tsiftes 2011-11-21 16:14:22 +01:00 committed by Niclas Finne
parent 987b57b015
commit eba64bdc5e
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cpu/msp430/Makefile.msp430
View file

@ -11,15 +11,21 @@ CONTIKI_CPU=$(CONTIKI)/cpu/msp430
### Define the source files we have in the MSP430 port ### Define the source files we have in the MSP430 port
ifneq (,$(findstring msp430x5,$(MCU))) ifneq (,$(findstring msp430x1,$(MCU)))
CONTIKI_CPU_FAM_DIR = f5xxx CONTIKI_CPU_FAM_DIR = f1xxx
else else
ifneq (,$(findstring msp430x2,$(MCU))) ifneq (,$(findstring msp430x5,$(MCU)))
CONTIKI_CPU_FAM_DIR = f2xxx CONTIKI_CPU_FAM_DIR = f5xxx
else
ifneq (,$(findstring msp430x2,$(MCU)))
CONTIKI_CPU_FAM_DIR = f2xxx f1xxx
else
${error Unhandled MSP430 family: "$(MCU)"}
endif
endif endif
endif endif
CONTIKI_CPU_DIRS = $(CONTIKI_CPU_FAM_DIR) f1xxx . dev CONTIKI_CPU_DIRS = $(CONTIKI_CPU_FAM_DIR) . dev
MSP430 = msp430.c flash.c clock.c leds.c leds-arch.c \ MSP430 = msp430.c flash.c clock.c leds.c leds-arch.c \
watchdog.c lpm.c mtarch.c rtimer-arch.c watchdog.c lpm.c mtarch.c rtimer-arch.c