From eba64bdc5e73b20cbd6893aedbc295e402227540 Mon Sep 17 00:00:00 2001 From: Nicolas Tsiftes Date: Mon, 21 Nov 2011 16:14:22 +0100 Subject: [PATCH] Be more explicit with the relationship between inheritance between MSP430 families. --- cpu/msp430/Makefile.msp430 | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/cpu/msp430/Makefile.msp430 b/cpu/msp430/Makefile.msp430 index 687853bf6..b907ea328 100644 --- a/cpu/msp430/Makefile.msp430 +++ b/cpu/msp430/Makefile.msp430 @@ -11,15 +11,21 @@ CONTIKI_CPU=$(CONTIKI)/cpu/msp430 ### Define the source files we have in the MSP430 port -ifneq (,$(findstring msp430x5,$(MCU))) - CONTIKI_CPU_FAM_DIR = f5xxx +ifneq (,$(findstring msp430x1,$(MCU))) + CONTIKI_CPU_FAM_DIR = f1xxx else - ifneq (,$(findstring msp430x2,$(MCU))) - CONTIKI_CPU_FAM_DIR = f2xxx + ifneq (,$(findstring msp430x5,$(MCU))) + 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 -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 \ watchdog.c lpm.c mtarch.c rtimer-arch.c