Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / platforms / telosb / .platform

diff --git a/tos/platforms/telosb/.platform b/tos/platforms/telosb/.platform
index a3320113c62db1e1a0ee8226af3f559f751c11f4..25c6401cbc070b9c0f4deaa77de138d18f48c0e1 100644 (file)
--- a/tos/platforms/telosb/.platform
+++ b/tos/platforms/telosb/.platform
@@ -25,6 +25,7 @@ push( @includes, qw(
   %T/chips/cc2420/spi
   %T/chips/cc2420/transmit
   %T/chips/cc2420/unique
+  %T/chips/cc2420/security
   %T/chips/msp430
   %T/chips/msp430/adc12
   %T/chips/msp430/dma
@@ -55,7 +56,7 @@ $ENV{'CIL_MACHINE'} =
     "version_major=3 " .
     "version_minor=2 " .
     "version=msp430-3.2.3 " .
-    "short=2,2, " .
+    "short=2,2 " .
     "int=2,2 " .
     "long=4,2 " .
     "long_long=8,2 " .
@@ -64,7 +65,7 @@ $ENV{'CIL_MACHINE'} =
     "float=4,2 " .
     "double=4,2 " .
     "long_double=4,2 " .
-    "void=2,1 " .
+    "void=1,1 " .
     "fun=1,2 " .
     "wchar_size_size=2,2 " .
     "alignof_string=1 " .