giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #56 from cmorty/sky_flash_optimization

Browse Source 
Sky flash optimization
This commit is contained in:
Adam Dunkels 2012-12-11 23:47:56 -08:00
commit 46402d7f09
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
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)
@ -95,9 +94,15 @@ else
BSL = $(CONTIKI)/tools/sky/msp430-bsl-linux --telosb BSL = $(CONTIKI)/tools/sky/msp430-bsl-linux --telosb
BSL_FILETYPE = -I BSL_FILETYPE = -I
endif endif
MOTES = $(shell $(MOTELIST) 2>&- | grep USB | \ ifdef MOTEIDS
cut -f 4 -d \ | \ MOTES = $(foreach MOTEID, $(MOTEIDS), $(shell $(MOTELIST) 2>&- | grep $(MOTEID) | \
perl -ne 'print $$1 . " " if(m-(/dev/[\w+\.\-]+)-);') 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) CMOTES=$(MOTES)
endif endif
endif endif
@ -112,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