From 7213d36d639e9170f3e8dee8703fbf3ca4ed9252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20=27Morty=27=20Str=C3=BCbe?= <morty@gmx.net>
Date: Tue, 11 Dec 2012 12:09:28 +0100
Subject: [PATCH 1/2] Support MOTEIDS for flashing, etc

---
 platform/sky/Makefile.common | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/platform/sky/Makefile.common b/platform/sky/Makefile.common
index bfc32b09d..d133464ba 100644
--- a/platform/sky/Makefile.common
+++ b/platform/sky/Makefile.common
@@ -95,9 +95,15 @@ else
       BSL = $(CONTIKI)/tools/sky/msp430-bsl-linux --telosb
       BSL_FILETYPE = -I
     endif
-    MOTES = $(shell $(MOTELIST) 2>&- | grep USB | \
-       cut -f 4 -d \  | \
-       perl -ne 'print $$1 . " " if(m-(/dev/[\w+\.\-]+)-);')
+    ifdef MOTEIDS
+  	  MOTES = $(foreach MOTEID, $(MOTEIDS), $(shell $(MOTELIST)  2>&- | grep $(MOTEID) | \
+          cut -f 4 -d \  | \
+          perl -ne 'print $$1 . " " if(m-(/dev/[\w+\.\-]+)-);') 
+    else
+      MOTES = $(shell $(MOTELIST) 2>&- | grep USB | \
+         cut -f 4 -d \  | \
+         perl -ne 'print $$1 . " " if(m-(/dev/[\w+\.\-]+)-);')
+    endif
     CMOTES=$(MOTES)
   endif
 endif

From 79aa5dbc01bc16d54dc8319ddc9f8ed0db1cd6ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20=27Morty=27=20Str=C3=BCbe?= <morty@gmx.net>
Date: Tue, 11 Dec 2012 12:09:29 +0100
Subject: [PATCH 2/2] Get rid of generc ihex-file to allow parallel uploads

---
 platform/sky/Makefile.common | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/platform/sky/Makefile.common b/platform/sky/Makefile.common
index d133464ba..10c9ff8d3 100644
--- a/platform/sky/Makefile.common
+++ b/platform/sky/Makefile.common
@@ -34,7 +34,6 @@ LDFLAGS += $(LDFLAGSNO) -Felf -yn
 endif # IAR
 
 NUMPAR=20
-IHEXFILE=tmpimage.ihex
 
 # Check if we are running under Windows
 ifeq ($(HOST_OS),Windows)
@@ -118,20 +117,17 @@ sky-motes:
 
 ifdef MOTE
 %.upload: %.ihex
-	cp $< $(IHEXFILE)
-	$(MAKE) sky-u.$(subst /,_,$(word $(MOTE), $(MOTES)))
+	$(MAKE) IHEXFILE=$< sky-u.$(subst /,_,$(word $(MOTE), $(MOTES)))
 else # MOTE
 %.upload: %.ihex
-	cp $< $(IHEXFILE)
-	$(MAKE) sky-reset sky-upload
+	$(MAKE) IHEXFILE=$< sky-reset sky-upload
 endif # MOTE
 
 upload-ihex:
 ifdef FILE
 	@echo Uploading $(FILE)
-	cp $(FILE) $(IHEXFILE)
 ifdef MOTE
-	$(MAKE) sky-u.$(subst /,_,$(word $(MOTE), $(MOTES)))
+	$(MAKE) IHEXFILE=$(FILE) sky-u.$(subst /,_,$(word $(MOTE), $(MOTES)))
 else # MOTE
 	$(MAKE) sky-reset sky-upload
 endif # MOTE