* removed missing header from msb-430-common board_init

* fixed msba2 related makefiles

msb-430-common/board_init.c

@@ -3,7 +3,6 @@
 #include "kernel_intern.h"
 #include "msp430.h"
 #include "debug.h"
-#include "msb430-uart1.h"
 
 volatile static uint32_t __msp430_cpu_speed = MSP430_INITIAL_CPU_SPEED;
 

msb-430h/makefile

@@ -29,7 +29,7 @@ $(BINDIR)%.o: %.c
 # remove compilation products
 clean:
 	$(MAKE) -C ../msb-430-common clean
-	rm -f $(BINDIR)msb-430_base.a $(OBJ) $(DEP)
+	rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
 	@if [ -d $(BINDIR) ] ; \
 	then rmdir $(BINDIR) ; \
 	fi 

msba2-common/makefile

@@ -13,7 +13,7 @@ all: $(BINDIR)msba2_common_base.a
 	$(MAKE) -C drivers
 
 $(BINDIR)msba2_common_base.a: $(OBJ)
-	$(AR) rcs $(BINDIR)msba2_base.a $(OBJ)
+	$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
 
 # pull in dependency info for *existing* .o files
 -include $(OBJ:.o=.d)

msba2/makefile

@@ -1,6 +1,7 @@
 SRC = $(wildcard *.c)
 BINDIR = bin/
 OBJ = $(SRC:%.c=$(BINDIR)%.o)## defines
+export ARCH = msba2_base.a
 
 DEP = $(SRC:%.c=$(BINDIR)%.d)
 
@@ -8,11 +9,11 @@ INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
 INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/
 INCLUDES += -I$(RIOTBASE)/cpu/lpc2387/include/
 
-all: $(BINDIR)msba2_base.a 
+all: $(BINDIR)$(ARCH) 
 	$(MAKE) -C ../msba2-common
 
-$(BINDIR)msba2_base.a: $(OBJ)
-	$(AR) rcs $(BINDIR)msba2_base.a $(OBJ)
+$(BINDIR)$(ARCH): $(OBJ)
+	$(AR) rcs $(BINDIR)$(ARCH) $(OBJ)
 
 # pull in dependency info for *existing* .o files
 -include $(OBJ:.o=.d)
@@ -27,7 +28,7 @@ $(BINDIR)%.o: %.c
 # remove compilation products
 clean:
 	$(MAKE) -C ../msba2-common clean
-	rm -f $(BINDIR)msba2_base.a $(OBJ) $(DEP)
+	rm -f $(BINDIR)$(ARCH) $(OBJ) $(DEP)
 	@if [ -d $(BINDIR) ] ; \
 	then rmdir $(BINDIR) ; \
 	fi