Merge TinyOS 2.1.1 into master.

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

diff --git a/tos/platforms/shimmer/.platform b/tos/platforms/shimmer/.platform
index f9b1fd0040a340424f964a35e33ce32f9f791bbd..1a3a7e8db078ae31f566c41005353be606c87274 100644 (file)
--- a/tos/platforms/shimmer/.platform
+++ b/tos/platforms/shimmer/.platform
@@ -8,10 +8,13 @@
 
 push( @includes, qw(
 
+      .
   %T/platforms/shimmer
   %T/platforms/shimmer/chips/cc2420
   %T/platforms/shimmer/chips/mma7260
   %T/platforms/shimmer/chips/sd
+  %T/platforms/shimmer/chips/bluetooth
+  %T/platforms/shimmer/chips/msp430
   %T/chips/cc2420
   %T/chips/cc2420/alarm
   %T/chips/cc2420/control
@@ -25,6 +28,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
@@ -48,3 +52,28 @@ push( @includes, qw(
 
 push @opts, "-fnesc-scheduler=TinySchedulerC,TinySchedulerC.TaskBasic,TaskBasic,TaskBasic,runTask,postTask" if !$with_scheduler_flag;
 push @opts, "-mingw-gcc" if $cygwin;
+
+$ENV{'CIL_MACHINE'} =
+    "version_major=3 " .
+    "version_minor=2 " .
+    "version=msp430-3.2.3 " .
+    "short=2,2 " .
+    "int=2,2 " .
+    "long=4,2 " .
+    "long_long=8,2 " .
+    "pointer=2,2 " .
+    "enum=2,2 " .
+    "float=4,2 " .
+    "double=4,2 " .
+    "long_double=4,2 " .
+    "void=1,1 " .
+    "fun=1,2 " .
+    "wchar_size_size=2,2 " .
+    "alignof_string=1 " .
+    "max_alignment=1 " .
+    "char_wchar_signed=true,true " .
+    "const_string_literals=true " .
+    "big_endian=false " .
+    "underscore_name=false " .
+    "__builtin_va_list=true " .
+    "__thread_is_keyword=true";