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

[Jonathan Hui]

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

Modified Files:
	bnp.extra 
Log Message:
- Install TOSBoot by default.



Index: bnp.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/bnp.extra,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** bnp.extra	22 Jul 2005 18:05:16 -0000	1.13
--- bnp.extra	28 Jul 2005 21:00:46 -0000	1.14
***************
*** 5,62 ****
  TOSBOOT_DIR ?= $(TOSDIR)/lib/Deluge/TOSBoot/build
  
! ifdef TINYOS_NP
!   ifeq ($(TINYOS_NP),BNP)
  
!     ifeq ($(TARGETS),mica2)
!       CFLAGS += -I$(DELUGE_DIR)
!       BOOTLOADER ?= $(TOSBOOT_DIR)/mica2/main.ihex
!       AVR_FUSE_H ?= 0xd8
!     endif
  
!     ifeq ($(TARGETS),mica2dot)
!       CFLAGS += -I$(DELUGE_DIR)
!       BOOTLOADER ?= $(TOSBOOT_DIR)/mica2dot/main.ihex
!       AVR_FUSE_H ?= 0xd8
!     endif
  
!     ifeq ($(TARGETS),micaz)
!       CFLAGS += -I$(DELUGE_DIR)
!       BOOTLOADER ?= $(TOSBOOT_DIR)/micaz/main.ihex
!       AVR_FUSE_H ?= 0xd8
!     endif
  
!     ifeq ($(TARGETS),pc)
!       CFLAGS += -I$(DELUGE_DIR)
!       CFLAGS += -I%T/lib/Flash
!       CFLAGS += -I%T/lib/Flash/STM25P
!       CFLAGS += -DDEFAULT_EEPROM_SIZE=0x100000
!     endif
  
!     ifneq ($(filter telos telosa,$(TARGETS)),)
!       ifeq ($(TELOS_REV),B)
!         TARGETS := telosb
!       else
! 	CFLAGS += -I$(DELUGE_DIR)
!         ifeq ($(filter docs,$(GOALS)),)
!           CFLAGS += -Wl,--section-start=.text=0x1a00,--defsym=_reset_vector__=0x1100
!         endif
!         BOOTLOADER ?= $(TOSBOOT_DIR)/telos/main.ihex
!         ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
!           BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
!         endif
!       endif
!     endif
  
!     ifneq ($(filter telosb tmote,$(TARGETS)),)
!       CFLAGS += -I$(DELUGE_DIR)
        ifeq ($(filter docs,$(GOALS)),)
!         CFLAGS += -Wl,--section-start=.text=0x4800,--defsym=_reset_vector__=0x4000
        endif
!       BOOTLOADER ?= $(TOSBOOT_DIR)/telosb/main.ihex
        ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
          BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
        endif
      endif
  
    endif
  endif
--- 5,56 ----
  TOSBOOT_DIR ?= $(TOSDIR)/lib/Deluge/TOSBoot/build
  
! ifndef NO_TOSBOOT
  
!   CFLAGS += -I$(DELUGE_DIR)
  
!   ifeq ($(TARGETS),mica2)
!     BOOTLOADER ?= $(TOSBOOT_DIR)/mica2/main.ihex
!     AVR_FUSE_H ?= 0xd8
!   endif
  
!   ifeq ($(TARGETS),mica2dot)
!     BOOTLOADER ?= $(TOSBOOT_DIR)/mica2dot/main.ihex
!     AVR_FUSE_H ?= 0xd8
!   endif
  
!   ifeq ($(TARGETS),micaz)
!     BOOTLOADER ?= $(TOSBOOT_DIR)/micaz/main.ihex
!     AVR_FUSE_H ?= 0xd8
!   endif
  
!   ifeq ($(TARGETS),pc)
!     CFLAGS += -I%T/lib/Flash
!     CFLAGS += -I%T/lib/Flash/STM25P
!     CFLAGS += -DDEFAULT_EEPROM_SIZE=0x100000
!   endif
  
!   ifneq ($(filter telos telosa,$(TARGETS)),)
!     ifeq ($(TELOS_REV),B)
!       TARGETS := telosb
!     else
        ifeq ($(filter docs,$(GOALS)),)
!         CFLAGS += -Wl,--section-start=.text=0x1a00,--defsym=_reset_vector__=0x1100
        endif
!       BOOTLOADER ?= $(TOSBOOT_DIR)/telos/main.ihex
        ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
          BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
        endif
      endif
+   endif
  
+   ifneq ($(filter telosb tmote,$(TARGETS)),)
+      ifeq ($(filter docs,$(GOALS)),)
+       CFLAGS += -Wl,--section-start=.text=0x4800,--defsym=_reset_vector__=0x4000
+     endif
+     BOOTLOADER ?= $(TOSBOOT_DIR)/telosb/main.ihex
+     ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
+       BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
+     endif
    endif
+ 
  endif