From 8886601bbb67096c2f827d856d6739979b70fadc Mon Sep 17 00:00:00 2001
From: klueska <klueska>
Date: Tue, 11 Mar 2008 09:34:13 +0000
Subject: [PATCH] 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

---
 support/make/avr/avr.rules     | 2 +-
 support/make/eyesIFXv1.target  | 2 +-
 support/make/eyesIFXv2.target  | 5 +----
 support/make/intelmote2.target | 2 +-
 support/make/null/null.rules   | 3 ++-
 support/make/telosa.target     | 2 +-
 support/make/telosb.target     | 2 +-
 support/make/tinynode.target   | 2 +-
 8 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index ce0f17ba..d3acf1d7 100644
--- a/support/make/avr/avr.rules
+++ b/support/make/avr/avr.rules
@@ -47,7 +47,7 @@ MAIN_SREC = $(BUILDDIR)/main.srec
 MAIN_IHEX = $(BUILDDIR)/main.ihex
 INSTALL_SREC = $(MAIN_SREC).out$(if $(NODEID),-$(NODEID),)
 VOLUMEFILE = volumes-at45db.xml
-VOLUME_ALLOCATOR = tos-storage-at45db
+VOLUME_ALLOCATOR ?= tos-storage-at45db
 VOLUME_ALLOCATOR_FLAGS ?=
 
 PFLAGS += -Wall -Wshadow $(NESC_FLAGS)
diff --git a/support/make/eyesIFXv1.target b/support/make/eyesIFXv1.target
index 71e88c25..08814478 100644
--- a/support/make/eyesIFXv1.target
+++ b/support/make/eyesIFXv1.target
@@ -14,7 +14,7 @@ DEFAULT_PROGRAM = jtag
 endif
 
 VOLUME_FILE = volumes-stm25p.xml
-VOLUME_ALLOCATOR = tos-storage-stm25p
+VOLUME_ALLOCATOR ?= tos-storage-stm25p
 
 NESC_FLAGS:=-Wnesc-all
 
diff --git a/support/make/eyesIFXv2.target b/support/make/eyesIFXv2.target
index 101bff31..808c4114 100644
--- a/support/make/eyesIFXv2.target
+++ b/support/make/eyesIFXv2.target
@@ -7,7 +7,7 @@ MSP_MCU = msp430x1611
 
 #Flash Config
 VOLUME_FILE = volumes-at45db.xml
-VOLUME_ALLOCATOR = tos-storage-at45db
+VOLUME_ALLOCATOR ?= tos-storage-at45db
 
 # Disable MSP430 hardware multiply because it makes MSPGCC die
 PFLAGS += -mdisable-hwmul
@@ -27,9 +27,6 @@ endif
 
 NESC_FLAGS:=-Wnesc-all -mdisable-hwmul
 
-VOLUME_FILE = volumes-at45db.xml
-VOLUME_ALLOCATOR = tos-storage-at45db
-
 $(call TOSMake_include_platform,msp)
 
 eyesIFXv2: $(BUILD_DEPS)
diff --git a/support/make/intelmote2.target b/support/make/intelmote2.target
index 3227061d..727aca0d 100644
--- a/support/make/intelmote2.target
+++ b/support/make/intelmote2.target
@@ -7,7 +7,7 @@ PFLAGS += -DCC2420_DEF_CHANNEL=$(CC2420_CHANNEL)
 endif
 
 VOLUME_FILE = volumes-pxa27xp30.xml
-VOLUME_ALLOCATOR = tos-storage-pxa27xp30
+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
diff --git a/support/make/null/null.rules b/support/make/null/null.rules
index d4313119..32513386 100644
--- a/support/make/null/null.rules
+++ b/support/make/null/null.rules
@@ -21,6 +21,7 @@ MAIN_SREC = $(BUILDDIR)/main.srec
 MAIN_IHEX = $(BUILDDIR)/main.ihex
 INSTALL_SREC = $(MAIN_SREC).out$(if $(NODEID),-$(NODEID),)
 VOLUMEFILE = volumes-at45db.xml
+VOLUME_ALLOCATOR ?= tos-storage-at45db
 
 PFLAGS += -Wall -Wshadow $(NESC_FLAGS)
 PFLAGS += -target=$(PLATFORM) -fnesc-cfile=$(BUILDDIR)/app.c
@@ -39,7 +40,7 @@ ifneq ($(wildcard $(VOLUMEFILE)), )
 exe0: $(BUILDDIR)/StorageVolumes.h
 
 $(BUILDDIR)/StorageVolumes.h: $(VOLUMEFILE)
-	tos-storage-at45db <$(VOLUMEFILE) >$@
+	$(VOLUME_ALLOCATOR) $(VOLUME_ALLOCATOR_FLAGS) <$(VOLUMEFILE) >$@
 
 PFLAGS += -I$(BUILDDIR)
 endif
diff --git a/support/make/telosa.target b/support/make/telosa.target
index e4bf609e..2755c1d8 100644
--- a/support/make/telosa.target
+++ b/support/make/telosa.target
@@ -16,7 +16,7 @@ PFLAGS += -DCC2420_DEF_CHANNEL=$(CC2420_CHANNEL)
 endif
 
 VOLUME_FILE = volumes-at45db.xml
-VOLUME_ALLOCATOR = tos-storage-at45db
+VOLUME_ALLOCATOR ?= tos-storage-at45db
 
 $(call TOSMake_include_platform,msp)
 
diff --git a/support/make/telosb.target b/support/make/telosb.target
index ecaa5712..697edf07 100644
--- a/support/make/telosb.target
+++ b/support/make/telosb.target
@@ -13,7 +13,7 @@ MSP_BSL ?= tos-bsl
 MSP_BSL_FLAGS = --telosb
 
 VOLUME_FILE = volumes-stm25p.xml
-VOLUME_ALLOCATOR = tos-storage-stm25p
+VOLUME_ALLOCATOR ?= tos-storage-stm25p
 
 ifdef CC2420_CHANNEL
 PFLAGS += -DCC2420_DEF_CHANNEL=$(CC2420_CHANNEL)
diff --git a/support/make/tinynode.target b/support/make/tinynode.target
index 789862ba..6c669064 100644
--- a/support/make/tinynode.target
+++ b/support/make/tinynode.target
@@ -11,7 +11,7 @@ MSP_BSL ?= tos-bsl
 
 #Flash Config
 VOLUME_FILE = volumes-at45db.xml
-VOLUME_ALLOCATOR = tos-storage-at45db
+VOLUME_ALLOCATOR ?= tos-storage-at45db
 
 OPTFLAGS += -Os
 #OPTFLAGS = 
-- 
2.39.2