[Tinyos-2-commits] CVS: tinyos-2.x/support/make Makedefaults, 1.2, 1.3 Makerules, 1.2, 1.3 README, 1.2, 1.3 all.target, 1.2, 1.3 btnode3.target, 1.2, 1.3 clean.target, 1.2, 1.3 docs.extra, 1.2, 1.3 eyesIFXv1.target, 1.2, 1.3 eyesIFXv2.target, 1.2, 1.3 ident_flags.extra, 1.2, 1.3 intelmote2.target, 1.2, 1.3 mica2.target, 1.2, 1.3 mica2dot.target, 1.2, 1.3 micaz.target, 1.2, 1.3 null.target, 1.2, 1.3 sim-cygwin.extra, 1.2, 1.3 sim-fast.extra, 1.2, 1.3 sim.extra, 1.2, 1.3 telos.target, 1.2, 1.3 telosa.target, 1.2, 1.3 telosb.target, 1.2, 1.3 tinynode.target, 1.2, 1.3 tmote.target, 1.2, 1.3 tos_image.extra, 1.2, 1.3 verbose.extra, 1.2, 1.3

Phil Levis scipio at users.sourceforge.net
Tue Nov 7 11:32:23 PST 2006


Update of /cvsroot/tinyos/tinyos-2.x/support/make
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22851/support/make

Modified Files:
	Makedefaults Makerules README all.target btnode3.target 
	clean.target docs.extra eyesIFXv1.target eyesIFXv2.target 
	ident_flags.extra intelmote2.target mica2.target 
	mica2dot.target micaz.target null.target sim-cygwin.extra 
	sim-fast.extra sim.extra telos.target telosa.target 
	telosb.target tinynode.target tmote.target tos_image.extra 
	verbose.extra 
Log Message:
Merge over into the trunk.









Index: eyesIFXv1.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/eyesIFXv1.target,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** eyesIFXv1.target	12 Jul 2006 16:59:44 -0000	1.2
--- eyesIFXv1.target	7 Nov 2006 19:30:39 -0000	1.3
***************
*** 14,17 ****
--- 14,20 ----
  endif
  
+ VOLUME_FILE = volumes-stm25p.xml
+ VOLUME_ALLOCATOR = tos-storage-stm25p
+ 
  NESC_FLAGS:=-Wnesc-all
  

Index: eyesIFXv2.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/eyesIFXv2.target,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** eyesIFXv2.target	12 Jul 2006 16:59:45 -0000	1.2
--- eyesIFXv2.target	7 Nov 2006 19:30:39 -0000	1.3
***************
*** 6,9 ****
--- 6,13 ----
  MSP_MCU = msp430x1611
  
+ #Flash Config
+ VOLUME_FILE = volumes-at45db.xml
+ VOLUME_ALLOCATOR = tos-storage-at45db
+ 
  # Disable MSP430 hardware multiply because it makes MSPGCC die
  PFLAGS += -mdisable-hwmul
***************
*** 24,27 ****
--- 28,34 ----
  NESC_FLAGS:=-Wnesc-all -mdisable-hwmul
  
+ VOLUME_FILE = volumes-at45db.xml
+ VOLUME_ALLOCATOR = tos-storage-at45db
+ 
  $(call TOSMake_include_platform,msp)
  


Index: intelmote2.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/intelmote2.target,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** intelmote2.target	12 Jul 2006 16:59:47 -0000	1.2
--- intelmote2.target	7 Nov 2006 19:30:40 -0000	1.3
***************
*** 7,10 ****
--- 7,13 ----
  endif
  
+ VOLUME_FILE = volumes-pxa27xp30.xml
+ VOLUME_ALLOCATOR = tos-storage-pxa27xp30
+ 
  #ASSEMBLY_FILES += $(PLATFORM_DIR)/../imote2/flash.s $(PLATFORM_DIR)/../imote2/binarymover.s
  ASSEMBLY_FILES += $(TOSDIR)/platforms/intelmote2/toscrt0.s $(TOSDIR)/chips/pxa27x/pxa27x_util.s






Index: sim-fast.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/sim-fast.extra,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sim-fast.extra	12 Jul 2006 16:59:48 -0000	1.2
--- sim-fast.extra	7 Nov 2006 19:30:40 -0000	1.3
***************
*** 15,18 ****
--- 15,20 ----
  CXXFILE    = $(TOSDIR)/lib/tossim/tossim.c
  CXXOBJFILE = $(BUILDDIR)/tossim.o
+ HASHFILE    = $(TOSDIR)/lib/tossim/hashtable.c
+ HASHOBJFILE = $(BUILDDIR)/c-support.o
  PYFILE     = $(TOSDIR)/lib/tossim/tossim_wrap.cxx
  PYOBJFILE  = $(BUILDDIR)/pytossim.o
***************
*** 52,59 ****
  	@echo "  compiling $(COMPONENT) to object file sim.o"
  	$(NCC) -c $(PLATFORM_FLAGS) -o $(OBJFILE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WFLAGS) $(COMPONENT).nc $(LDFLAGS)  $(DUMPTYPES) -fnesc-dumpfile=$(XML)
! 
! 	@echo "  compiling Python support into pytossim.o and tossim.o"
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
  	@echo "  linking into shared object ./$(SHARED_OBJECT)"
  	$(GPP) $(PLATFORM_BUILD_FLAGS) $(PLATFORM_CC_FLAGS) $(PYOBJFILE) $(OBJFILE) $(CXXOBJFILE) $(PLATFORM_LIB_FLAGS) -o $(SHARED_OBJECT)
--- 54,61 ----
  	@echo "  compiling $(COMPONENT) to object file sim.o"
  	$(NCC) -c $(PLATFORM_FLAGS) -o $(OBJFILE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WFLAGS) $(COMPONENT).nc $(LDFLAGS)  $(DUMPTYPES) -fnesc-dumpfile=$(XML)
! 	@echo "  compiling Python support and C libraries into pytossim.o, tossim.o, and c-support.o"
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
+ 	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(HASHOBJFILE) $(OPTFLAGS) $(CFLAGS) $(HASHFILE) -I$(PYDIR) -I$(SIMDIR)
  	@echo "  linking into shared object ./$(SHARED_OBJECT)"
  	$(GPP) $(PLATFORM_BUILD_FLAGS) $(PLATFORM_CC_FLAGS) $(PYOBJFILE) $(OBJFILE) $(CXXOBJFILE) $(PLATFORM_LIB_FLAGS) -o $(SHARED_OBJECT)

Index: sim.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/sim.extra,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sim.extra	12 Jul 2006 16:59:48 -0000	1.2
--- sim.extra	7 Nov 2006 19:30:40 -0000	1.3
***************
*** 8,12 ****
  PFLAGS += -tossim -fnesc-nido-tosnodes=1000 -fnesc-simulate -fnesc-nido-motenumber=sim_node\(\)  
  WFLAGS = -Wno-nesc-data-race
! PYTHON_VERSION=2.3
  
  BUILDDIR   = simbuild/$(PLATFORM)
--- 8,12 ----
  PFLAGS += -tossim -fnesc-nido-tosnodes=1000 -fnesc-simulate -fnesc-nido-motenumber=sim_node\(\)  
  WFLAGS = -Wno-nesc-data-race
! PYTHON_VERSION=2.4
  
  BUILDDIR   = simbuild/$(PLATFORM)
***************
*** 15,18 ****
--- 15,20 ----
  CXXFILE    = $(TOSDIR)/lib/tossim/tossim.c
  CXXOBJFILE = $(BUILDDIR)/tossim.o
+ HASHFILE    = $(TOSDIR)/lib/tossim/hashtable.c
+ HASHOBJFILE = $(BUILDDIR)/c-support.o
  PYFILE     = $(TOSDIR)/lib/tossim/tossim_wrap.cxx
  PYOBJFILE  = $(BUILDDIR)/pytossim.o
***************
*** 53,61 ****
  	$(NCC) -c $(PLATFORM_FLAGS) -o $(OBJFILE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WFLAGS) $(COMPONENT).nc $(LDFLAGS)  $(DUMPTYPES) -fnesc-dumpfile=$(XML)
  
! 	@echo "  compiling Python support into pytossim.o and tossim.o"
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
  	@echo "  linking into shared object ./$(SHARED_OBJECT)"
! 	$(GPP) $(PLATFORM_BUILD_FLAGS) $(PLATFORM_CC_FLAGS) $(PYOBJFILE) $(OBJFILE) $(CXXOBJFILE) $(PLATFORM_LIB_FLAGS) -o $(SHARED_OBJECT)
  	@echo "  copying Python script interface TOSSIM.py from lib/tossim to local directory"
  	@cp $(TOSDIR)/lib/tossim/TOSSIM.py .
--- 55,64 ----
  	$(NCC) -c $(PLATFORM_FLAGS) -o $(OBJFILE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(WFLAGS) $(COMPONENT).nc $(LDFLAGS)  $(DUMPTYPES) -fnesc-dumpfile=$(XML)
  
! 	@echo "  compiling Python support and C libraries into pytossim.o, tossim.o, and c-support.o"
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(PYOBJFILE) $(OPTFLAGS) $(CFLAGS) $(PYFILE) -I$(PYDIR) -I$(SIMDIR) -DHAVE_CONFIG_H 
  	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(CXXOBJFILE) $(OPTFLAGS) $(CFLAGS) $(CXXFILE) -I$(PYDIR) -I$(SIMDIR)
+ 	$(GPP) -c $(PLATFORM_CC_FLAGS) $(PLATFORM_FLAGS) -o $(HASHOBJFILE) $(OPTFLAGS) $(CFLAGS) $(HASHFILE) -I$(PYDIR) -I$(SIMDIR)
  	@echo "  linking into shared object ./$(SHARED_OBJECT)"
! 	$(GPP) $(PLATFORM_BUILD_FLAGS) $(PLATFORM_CC_FLAGS) $(PYOBJFILE) $(OBJFILE) $(CXXOBJFILE) $(HASHOBJFILE) $(PLATFORM_LIB_FLAGS) -o $(SHARED_OBJECT)
  	@echo "  copying Python script interface TOSSIM.py from lib/tossim to local directory"
  	@cp $(TOSDIR)/lib/tossim/TOSSIM.py .




Index: tinynode.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/tinynode.target,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tinynode.target	12 Jul 2006 16:59:48 -0000	1.2
--- tinynode.target	7 Nov 2006 19:30:40 -0000	1.3
***************
*** 8,17 ****
  endif
  
- ifndef TOS_BETADIR
- TOS_BETADIR := $(TOSDIR)/../beta/tos
- endif
- 
  MSP_BSL ?= tos-bsl
  
  OPTFLAGS += -Os
  #OPTFLAGS = 
--- 8,17 ----
  endif
  
  MSP_BSL ?= tos-bsl
  
+ #Flash Config
+ VOLUME_FILE = volumes-at45db.xml
+ VOLUME_ALLOCATOR = tos-storage-at45db
+ 
  OPTFLAGS += -Os
  #OPTFLAGS = 
***************
*** 21,27 ****
  PFLAGS += -mstrict-align
  
- PFLAGS += \
- -I$(TOS_BETADIR)/platforms/tinynode
- 
  $(call TOSMake_include_platform,tinynode)
  $(call TOSMake_include_platform,msp)
--- 21,24 ----






More information about the Tinyos-2-commits mailing list