Incorporate new modular tos-bsl.

[tinyos-2.x.git] / support / make / msp / bsl.extra

diff --git a/support/make/msp/bsl.extra b/support/make/msp/bsl.extra
index 747e15f3ad6a5c65d11c7f22df575130f67ffc26..f8ad9e13cf05f9608aff3493694bc1789970ff6c 100644 (file)
--- a/support/make/msp/bsl.extra
+++ b/support/make/msp/bsl.extra
@@ -17,12 +17,12 @@ PROGRAM = bsl
 MSP_BSL ?= msp430-bsl
 # BSL is the comm port, can be specified as "bsl,2" when making
 BSL ?= auto
-MSP_BSL_FLAGS ?= --telos
+MSP_BSL_FLAGS ?= --device=telosa
 
 ifeq ($(BSL),auto)
-BSLTEST = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+?(\d+))/; print $$1;' )
+BSLTEST = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+?(\d+)[^,]*)/; print $$1;' )
 BSLTEST_COMMENT = "using bsl,auto"
-BSL = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+?(\d+))/; ($$s,$$n)=($$1,$$2); if($$s=~/^com/i) { print $$n-1 } else { print $$s; };' )
+BSL = $(shell motelist -c | perl -e '<> =~ /^[^,]+,(\S+?(\d+)[^,]*)/; ($$s,$$n)=($$1,$$2); if($$s=~/^com/i) { print $$n-1 } else { print $$s; };' )
 BSL_TARGETS += bsltest
 else
 ifeq ($(BSL:ref,%=ref),ref)
@@ -52,7 +52,7 @@ program_no_e: $(BSL_TARGETS) $(TELOS_PROGRAM_DEPS) FORCE
 
 program_bl: $(BSL_TARGETS) $(TELOS_PROGRAM_DEPS) FORCE
        @echo "    installing $(PLATFORM) bootloader using bsl"
-       $(MSP_BSL) $(MSP_BSL_FLAGS) -c $(BSL) -r -e -I -p $(BOOTLOADER)
+       $(MSP_BSL) $(MSP_BSL_FLAGS) -c $(BSL) -r -e -I -p $(BOOTLOADER_IMG)
 
 program_input: ihex
        @: