Mass platform updates for GCC 4.6.3

[tinyos-2.x.git] / support / make / tmicore.target

diff --git a/support/make/tmicore.target b/support/make/tmicore.target
index 680c6e5d3ec1403117d1c64a2515a5155f658429..2179b12575160773f862f4d6536f8ef1262ca084 100644 (file)
--- a/support/make/tmicore.target
+++ b/support/make/tmicore.target
@@ -3,17 +3,20 @@
 
 PLATFORM ?= tmicore
 
-#MSP_MCU = msp430x2417
+#MSP_MCU = msp430f2417
 
-# Disable MSP430 hardware multiply because it makes MSPGCC die
-PFLAGS += -mdisable-hwmul
+# Remove MSP430 hardware multiply disable: new msp430-gcc fixes
+# PFLAGS += -mmpy=none
 OPTFLAGS += -O
 
 MSP_BSL ?= tos-bsl
 MSP_BSL_FLAGS = --device=cp2103
 
-#VOLUME_FILE = volumes-stm25p.xml
-#VOLUME_ALLOCATOR ?= tos-storage-stm25p
+PLATFORMDIR = $(TOSDIR)/platforms/tmimsp/$(PLATFORM)
+PFLAGS += -I$(PLATFORMDIR)
+
+VOLUME_FILE = volumes-at25df041a.xml
+VOLUME_ALLOCATOR ?= tos-storage-stm25p
 
 ifdef CC2420_CHANNEL
 PFLAGS += -DCC2420_DEF_CHANNEL=$(CC2420_CHANNEL)