[Tinyos-commits] CVS: tinyos-1.x/tools/make bnp.extra,1.10,1.11

[Jonathan Hui]

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

Modified Files:
	bnp.extra 
Log Message:
- telosa now defaults to Deluge 2.0.



Index: bnp.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/bnp.extra,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** bnp.extra	12 Jul 2005 20:10:20 -0000	1.10
--- bnp.extra	17 Jul 2005 21:16:31 -0000	1.11
***************
*** 38,47 ****
          TARGETS := telosb
        else
!         CFLAGS += -I%T/lib/Deluge
!         CFLAGS += -I%T/lib/Deluge/TOSBoot/include
          ifeq ($(filter docs,$(GOALS)),)
!           CFLAGS += -Wl,--section-start=.text=0x3000,--defsym=_reset_vector__=0x1100
          endif
!         BOOTLOADER ?= $(TOSDIR)/lib/Deluge/TOSBoot/bl_telos.ihex
          ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
            BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
--- 38,46 ----
          TARGETS := telosb
        else
! 	CFLAGS += -I%T/../beta/Deluge/Deluge
          ifeq ($(filter docs,$(GOALS)),)
!           CFLAGS += -Wl,--section-start=.text=0x1a00,--defsym=_reset_vector__=0x1100
          endif
!         BOOTLOADER ?= $(TOSDIR)/../beta/Deluge/Deluge/TOSBoot/build/telos/main.ihex
          ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
            BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))