deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Get rid of generc ihex-file to allow parallel uploads

Browse source
This commit is contained in:
Moritz 'Morty' Strübe 2012-12-11 12:09:29 +01:00
parent 7213d36d63
commit 79aa5dbc01
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platform/sky/Makefile.common
View file

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