[Tinyos-2-commits] CVS: tinyos-2.x/support/make eyesIFXv1.target, 1.4, 1.5 eyesIFXv2.target, 1.4, 1.5 intelmote2.target, 1.3, 1.4 telosa.target, 1.5, 1.6 telosb.target, 1.4, 1.5 tinynode.target, 1.4, 1.5

[Kevin Klues]

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

Modified Files:
	eyesIFXv1.target eyesIFXv2.target intelmote2.target 
	telosa.target telosb.target tinynode.target 
Log Message:
Changed bsl.exra to search for the string between the commas and not short circuiting after seeing a digit when installing to some default tty device.  Also added some more variables to the avr.rules and msp430.rules to allow more flexibility in the way the tos-storage-XXX scripts are invoked

Index: eyesIFXv1.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/eyesIFXv1.target,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** eyesIFXv1.target	12 Dec 2006 18:22:55 -0000	1.4
--- eyesIFXv1.target	11 Mar 2008 09:34:13 -0000	1.5
***************
*** 15,19 ****
  
  VOLUME_FILE = volumes-stm25p.xml
! VOLUME_ALLOCATOR = tos-storage-stm25p
  
  NESC_FLAGS:=-Wnesc-all
--- 15,19 ----
  
  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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** eyesIFXv2.target	12 Dec 2006 18:22:55 -0000	1.4
--- eyesIFXv2.target	11 Mar 2008 09:34:13 -0000	1.5
***************
*** 8,12 ****
  #Flash Config
  VOLUME_FILE = volumes-at45db.xml
! VOLUME_ALLOCATOR = tos-storage-at45db
  
  # Disable MSP430 hardware multiply because it makes MSPGCC die
--- 8,12 ----
  #Flash Config
  VOLUME_FILE = volumes-at45db.xml
! VOLUME_ALLOCATOR ?= tos-storage-at45db
  
  # Disable MSP430 hardware multiply because it makes MSPGCC die
***************
*** 28,34 ****
  NESC_FLAGS:=-Wnesc-all -mdisable-hwmul
  
- VOLUME_FILE = volumes-at45db.xml
- VOLUME_ALLOCATOR = tos-storage-at45db
- 
  $(call TOSMake_include_platform,msp)
  
--- 28,31 ----

Index: intelmote2.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/intelmote2.target,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** intelmote2.target	7 Nov 2006 19:30:40 -0000	1.3
--- intelmote2.target	11 Mar 2008 09:34:13 -0000	1.4
***************
*** 8,12 ****
  
  VOLUME_FILE = volumes-pxa27xp30.xml
! VOLUME_ALLOCATOR = tos-storage-pxa27xp30
  
  #ASSEMBLY_FILES += $(PLATFORM_DIR)/../imote2/flash.s $(PLATFORM_DIR)/../imote2/binarymover.s
--- 8,12 ----
  
  VOLUME_FILE = volumes-pxa27xp30.xml
! VOLUME_ALLOCATOR ?= tos-storage-pxa27xp30
  
  #ASSEMBLY_FILES += $(PLATFORM_DIR)/../imote2/flash.s $(PLATFORM_DIR)/../imote2/binarymover.s

Index: telosa.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/telosa.target,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** telosa.target	13 Dec 2006 01:50:41 -0000	1.5
--- telosa.target	11 Mar 2008 09:34:13 -0000	1.6
***************
*** 17,21 ****
  
  VOLUME_FILE = volumes-at45db.xml
! VOLUME_ALLOCATOR = tos-storage-at45db
  
  $(call TOSMake_include_platform,msp)
--- 17,21 ----
  
  VOLUME_FILE = volumes-at45db.xml
! VOLUME_ALLOCATOR ?= tos-storage-at45db
  
  $(call TOSMake_include_platform,msp)

Index: telosb.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/telosb.target,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** telosb.target	12 Dec 2006 18:22:55 -0000	1.4
--- telosb.target	11 Mar 2008 09:34:13 -0000	1.5
***************
*** 14,18 ****
  
  VOLUME_FILE = volumes-stm25p.xml
! VOLUME_ALLOCATOR = tos-storage-stm25p
  
  ifdef CC2420_CHANNEL
--- 14,18 ----
  
  VOLUME_FILE = volumes-stm25p.xml
! VOLUME_ALLOCATOR ?= tos-storage-stm25p
  
  ifdef CC2420_CHANNEL

Index: tinynode.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/tinynode.target,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tinynode.target	12 Dec 2006 18:22:55 -0000	1.4
--- tinynode.target	11 Mar 2008 09:34:13 -0000	1.5
***************
*** 12,16 ****
  #Flash Config
  VOLUME_FILE = volumes-at45db.xml
! VOLUME_ALLOCATOR = tos-storage-at45db
  
  OPTFLAGS += -Os
--- 12,16 ----
  #Flash Config
  VOLUME_FILE = volumes-at45db.xml
! VOLUME_ALLOCATOR ?= tos-storage-at45db
  
  OPTFLAGS += -Os