Changed bsl.exra to search for the string between the commas and not short circuiting...

diff --git a/support/make/avr/avr.rules b/support/make/avr/avr.rules
index ce0f17ba4a6e619ba2a46eef5b9baf2ec5933eb2..d3acf1d74491ef1014eb333768222f790721b5ce 100644 (file)
--- 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 71e88c251af5c9baa151d98247fdd1b492ccf5a8..0881447837ed1a99c55bdacc9c9e61bab14ad334 100644 (file)
--- 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 101bff31cdbf336895ed331719fcd8d97bc9cf28..808c4114b213266befdfcd3f7911fcf3612362f3 100644 (file)
--- 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 3227061d7ad56b3803c3124aff6d308f56a1fe92..727aca0dfc3c7062cf9ce51b0b16344180992748 100644 (file)
--- 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 d4313119002a2fd8899766b3c1b90e103c5a11ce..32513386960e56915da090a1e484121273ea9985 100644 (file)
--- 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 e4bf609edc4cf7144522cf93925daf9433859e0a..2755c1d89abcc781b7a5d1475aae92c3acd6c02b 100644 (file)
--- 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 ecaa57120176bc869a35986ccb1463d894a660c9..697edf073f5f97af262f2f3252618b34ea8eef56 100644 (file)
--- 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 789862ba37e9289b107cbfc44189488dc74b5f3b..6c669064db8ca3125029d0710afff8db8aa2d9ca 100644 (file)
--- 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 =