[Tinyos-commits] CVS: tinyos-1.x/tools/make eyesIFX.target, 1.2, 1.3 eyesIFXv1.target, 1.3, 1.4 eyesIFXv2.target, 1.4, 1.5

[Kevin Klues]

Update of /cvsroot/tinyos/tinyos-1.x/tools/make
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16314/tools/make

Modified Files:
	eyesIFX.target eyesIFXv1.target eyesIFXv2.target 
Log Message:
Updated to work better for installing with USB with bsl

Index: eyesIFX.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/eyesIFX.target,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** eyesIFX.target	22 Mar 2005 15:50:06 -0000	1.2
--- eyesIFX.target	20 Jun 2005 14:35:17 -0000	1.3
***************
*** 1,5 ****
! EYES_IFX_REV ?= v2
  
! ifeq ($(EYES_IFX_REV),v2)
    EYES_IFX_TARGET = eyesIFXv2.target
  else
--- 1,5 ----
! EYES_IFX_REV ?= 2
  
! ifeq ($(EYES_IFX_REV),2)
    EYES_IFX_TARGET = eyesIFXv2.target
  else

Index: eyesIFXv1.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/eyesIFXv1.target,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** eyesIFXv1.target	12 Apr 2005 11:15:38 -0000	1.3
--- eyesIFXv1.target	20 Jun 2005 14:35:18 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
  #$Id$
  
+ FAMILY = eyes
  PLATFORM = eyesIFXv1
  
***************
*** 27,36 ****
  
  PFLAGS += \
! -I$(TINYOS_EYESDIR)/platform/eyesIFXv1 \
  -I$(TINYOS_EYESDIR)/platform/eyesIFX \
  -I$(TINYOS_EYESDIR)/tos/lib/Common \
  -I$(TINYOS_EYESDIR)/tos/lib/Chips/Radios/TDA5250 \
  -I$(TINYOS_EYESDIR)/tos/lib/Chips/Flash/M25P05 \
! -I$(TINYOS_EYESDIR)/tos/lib/Chips/Pots/MAX4615 \
  -I$(TINYOS_EYESDIR)/tos/lib/Sensors \
  -I$(TOSDIR)/platform/msp430 \
--- 28,37 ----
  
  PFLAGS += \
! -I$(TINYOS_EYESDIR)/platform/eyes/eyesIFXv1 \
  -I$(TINYOS_EYESDIR)/platform/eyesIFX \
  -I$(TINYOS_EYESDIR)/tos/lib/Common \
  -I$(TINYOS_EYESDIR)/tos/lib/Chips/Radios/TDA5250 \
  -I$(TINYOS_EYESDIR)/tos/lib/Chips/Flash/M25P05 \
! -I$(TINYOS_EYESDIR)/tos/lib/Chips/Pots/AD6200 \
  -I$(TINYOS_EYESDIR)/tos/lib/Sensors \
  -I$(TOSDIR)/platform/msp430 \

Index: eyesIFXv2.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/eyesIFXv2.target,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** eyesIFXv2.target	12 Apr 2005 11:15:38 -0000	1.4
--- eyesIFXv2.target	20 Jun 2005 14:35:18 -0000	1.5
***************
*** 6,10 ****
--- 6,14 ----
  #MSP_MCU ?= msp430x1611
  MSP_BSL_FLAGS ?= --invert-test --invert-reset --f1x
+ 
  BSL?=1
+ ifneq (,$(findstring USB,$(BSL)))
+   BSL:=/dev/tty$(BSL)
+ endif
  
  ifndef DEFAULT_PROGRAM
***************
*** 36,40 ****
  -I$(TINYOS_EYESDIR)/tos/lib/Chips/Radios/TDA5250 \
  -I$(TINYOS_EYESDIR)/tos/lib/Chips/Flash/AT45DB041 \
! -I$(TINYOS_EYESDIR)/tos/lib/Chips/Pots/MAX4615 \
  -I$(TINYOS_EYESDIR)/tos/lib/Sensors \
  -I$(TOSDIR)/platform/msp430 \
--- 40,44 ----
  -I$(TINYOS_EYESDIR)/tos/lib/Chips/Radios/TDA5250 \
  -I$(TINYOS_EYESDIR)/tos/lib/Chips/Flash/AT45DB041 \
! -I$(TINYOS_EYESDIR)/tos/lib/Chips/Pots/AD6200 \
  -I$(TINYOS_EYESDIR)/tos/lib/Sensors \
  -I$(TOSDIR)/platform/msp430 \