#MSP_MCU = msp430x1611
-# Disable MSP430 hardware multiply because it makes MSPGCC die
-PFLAGS += -mdisable-hwmul
+# Remove MSP430 hardware multiply disable: new msp430-gcc fixes
+# PFLAGS += -mdisable-hwmul
+
OPTFLAGS += -O
MSP_BSL ?= tos-bsl
-MSP_BSL_FLAGS = --telosb
+MSP_BSL_FLAGS = --device=telosb
VOLUME_FILE = volumes-stm25p.xml
-VOLUME_ALLOCATOR = tos-storage-stm25p
+VOLUME_ALLOCATOR ?= tos-storage-stm25p
ifdef CC2420_CHANNEL
PFLAGS += -DCC2420_DEF_CHANNEL=$(CC2420_CHANNEL)