? tinyos-1.x_beta_platform.patch
Index: imote2/.platform
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/.platform,v
retrieving revision 1.4
diff -u -p -r1.4 .platform
--- imote2/.platform	14 Jul 2006 19:06:19 -0000	1.4
+++ imote2/.platform	8 Apr 2008 19:28:21 -0000
@@ -9,7 +9,7 @@
 
 push @opts, "-mingw-gcc" if $cygwin;
 
-$ENV{NESC_MACHINE} = "pointer=4,4 float=4,4 double=8,4 long_double=8,4 short=2,2 int=4,4 long=4,4 long_long=8,4 int1248_align=1,2,4,4 wchar_size_size=4,4 char_wchar_signed=false,true gcc=xscale-elf-gcc";
+$ENV{NESC_MACHINE} = "pointer=4,4 float=4,4 double=8,4 long_double=8,4 short=2,2 int=4,4 long=4,4 long_long=8,4 int1248_align=1,2,4,4 wchar_size_size=4,4 char_wchar_signed=false,true";
 
 @commonplatforms = ("pxa27x");
-
+xscale-elf-gcc -c barecrt.s
Index: imote2/STUARTM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/STUARTM.nc,v
retrieving revision 1.2
diff -u -p -r1.2 STUARTM.nc
--- imote2/STUARTM.nc	4 Mar 2007 23:51:29 -0000	1.2
+++ imote2/STUARTM.nc	8 Apr 2008 19:28:21 -0000
@@ -2,7 +2,7 @@
  * @author Robbie Adler
  **/
 
-includes mmu;
+//includes mmu;
 module STUARTM {
   provides {
     interface BulkTxRx;
Index: imote2/hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/imote2/hardware.h,v
retrieving revision 1.11
diff -u -p -r1.11 hardware.h
--- imote2/hardware.h	4 Mar 2007 23:51:29 -0000	1.11
+++ imote2/hardware.h	8 Apr 2008 19:28:21 -0000
@@ -68,11 +68,11 @@
 #ifndef __TOSH_HARDWARE_H__
 #define __TOSH_HARDWARE_H__
 
-#include "utils.h"
-#include "systemUtil.h"
+#include "/opt/tinyos-1.x/beta/platform/pxa27x/lib/utils.h"
+#include "/opt/tinyos-1.x/beta/platform/pxa27x/lib/systemUtil.h"
 #include "assert.h"
 
-#include "pxa27xhardware.h"
+#include "/opt/tinyos-1.x/beta/platform/pxa27x/pxa27xhardware.h"
 #include "CC2420Const.h"
 #include "AM.h"
 
Index: pxa27x/util.s
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/pxa27x/util.s,v
retrieving revision 1.5
diff -u -p -r1.5 util.s
--- pxa27x/util.s	8 Dec 2005 23:17:51 -0000	1.5
+++ pxa27x/util.s	8 Apr 2008 19:28:22 -0000
@@ -1,9 +1,9 @@
 
-.macro CPWAIT  Rd
-        MRC     P15, 0, \Rd, C2, C0, 0       @ arbitrary read of CP15 into register Rd
-        MOV     \Rd, \Rd                     @ wait for it (foward dependency)
-        SUB     PC, PC, #4                   @ branch to next instruction
-.endm
+@.macro CPWAIT  Rd
+@        MRC     P15, 0, \Rd, C2, C0, 0       @ arbitrary read of CP15 into register Rd
+@        MOV     \Rd, \Rd                     @ wait for it (foward dependency)
+@        SUB     PC, PC, #4                   @ branch to next instruction
+@.endm
 
 	
 .macro ALLOCATE Rd