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

Added make variable with command name to show in warning

Browse source
This commit is contained in:
nifi 2010-05-27 12:42:48 +00:00
parent ac9b862cd0
commit eb63cb21e0
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/jcreate/Makefile.jcreate
View file

@ -1,4 +1,4 @@
# $Id: Makefile.jcreate,v 1.1 2010/05/03 21:57:35 nifi Exp $ # $Id: Makefile.jcreate,v 1.2 2010/05/27 12:42:49 nifi Exp $
# Some drivers such as ds2411.c only compile under platform sky # Some drivers such as ds2411.c only compile under platform sky
CFLAGS += -DCONTIKI_TARGET_SKY CFLAGS += -DCONTIKI_TARGET_SKY
@ -10,7 +10,7 @@ CONTIKI_TARGET_SOURCEFILES += contiki-jcreate-platform.c \
include $(CONTIKI)/platform/sky/Makefile.common include $(CONTIKI)/platform/sky/Makefile.common
ifneq ($(TMOTE_BSL), 1) ifneq ($(TMOTE_BSL), 1)
${warning No tmote-bsl command found. Please install this command in contiki-2.x/tools/sky} ${warning No $(TMOTE_BSL_FILE) command for jcreate found. Please install this command in $(CONTIKI)/tools/sky}
endif endif
CONTIKI_TARGET_DIRS += ${addprefix ../sky/,. dev apps} CONTIKI_TARGET_DIRS += ${addprefix ../sky/,. dev apps}

12
platform/sky/Makefile.common
View file

@ -1,4 +1,4 @@
# $Id: Makefile.common,v 1.1 2010/05/03 13:51:11 nifi Exp $ # $Id: Makefile.common,v 1.2 2010/05/27 12:42:48 nifi Exp $
ARCH=spi.c ds2411.c xmem.c i2c.c node-id.c sensors.c cfs-coffee.c \ ARCH=spi.c ds2411.c xmem.c i2c.c node-id.c sensors.c cfs-coffee.c \
cc2420.c cc2420-aes.c cc2420-arch.c cc2420-arch-sfd.c \ cc2420.c cc2420-aes.c cc2420-arch.c cc2420-arch-sfd.c \
@ -32,10 +32,11 @@ ifdef OS
USBDEVPREFIX=/dev/com USBDEVPREFIX=/dev/com
SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-windows SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-windows
MOTELIST = $(CONTIKI)/tools/sky/motelist-windows MOTELIST = $(CONTIKI)/tools/sky/motelist-windows
TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/tmote-bsl.exe),1,0) TMOTE_BSL_FILE = tmote-bsl
TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE).exe),1,0)
ifeq ($(TMOTE_BSL), 1) ifeq ($(TMOTE_BSL), 1)
NUMPAR = 1 NUMPAR = 1
BSL = $(CONTIKI)/tools/sky/tmote-bsl BSL = $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)
MOTES = $(shell $(MOTELIST) | grep COM | \ MOTES = $(shell $(MOTELIST) | grep COM | \
cut -f 4 -d \ ) cut -f 4 -d \ )
else else
@ -56,10 +57,11 @@ ifndef MOTELIST
USBDEVPREFIX= USBDEVPREFIX=
SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-linux SERIALDUMP = $(CONTIKI)/tools/sky/serialdump-linux
MOTELIST = $(CONTIKI)/tools/sky/motelist-linux MOTELIST = $(CONTIKI)/tools/sky/motelist-linux
TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/tmote-bsl-linux),1,0) TMOTE_BSL_FILE = tmote-bsl-linux
TMOTE_BSL=$(if $(wildcard $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)),1,0)
ifeq ($(TMOTE_BSL), 1) ifeq ($(TMOTE_BSL), 1)
PATH := $(PATH):$(CONTIKI)/tools/sky PATH := $(PATH):$(CONTIKI)/tools/sky
BSL = $(CONTIKI)/tools/sky/tmote-bsl-linux BSL = $(CONTIKI)/tools/sky/$(TMOTE_BSL_FILE)
NUMPAR = 1 NUMPAR = 1
else else
BSL = $(CONTIKI)/tools/sky/msp430-bsl-linux --telosb BSL = $(CONTIKI)/tools/sky/msp430-bsl-linux --telosb