[Tinyos-2-commits] CVS: tinyos-2.x/support/make/avr avr.rules, 1.10, 1.11

Kevin Klues klueska at users.sourceforge.net
Tue Mar 11 01:28:56 PDT 2008


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

Modified Files:
	avr.rules 
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: avr.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/avr/avr.rules,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** avr.rules	16 Feb 2008 19:48:52 -0000	1.10
--- avr.rules	11 Mar 2008 08:28:54 -0000	1.11
***************
*** 37,41 ****
  LIBS = -lm
  
- 
  AMADDR = ActiveMessageAddressC\$$addr
  # Uncomment the next two lines if you have a toolchain without the dollar sign
--- 37,40 ----
***************
*** 49,52 ****
--- 48,53 ----
  INSTALL_SREC = $(MAIN_SREC).out$(if $(NODEID),-$(NODEID),)
  VOLUMEFILE = volumes-at45db.xml
+ VOLUME_ALLOCATOR = tos-storage-at45db
+ VOLUME_ALLOCATOR_FLAGS ?=
  
  PFLAGS += -Wall -Wshadow $(NESC_FLAGS)
***************
*** 97,101 ****
  
  $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
! 	tos-storage-at45db $(PLATFORMDIR) <$(VOLUMEFILE) >$@ || rm -f $@
  
  PFLAGS += -I$(BUILDDIR)
--- 98,102 ----
  
  $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
! 	$(VOLUME_ALLOCATOR) $(PLATFORMDIR) $(VOLUME_ALLOCATOR_FLAGS) <$(VOLUMEFILE) >$@ || rm -f $@
  
  PFLAGS += -I$(BUILDDIR)



More information about the Tinyos-2-commits mailing list