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

[Jonathan Hui]

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

Modified Files:
	bnp.extra 
Log Message:
- Added support for mica2dot and micaz platforms.



Index: bnp.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/bnp.extra,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** bnp.extra	17 Jul 2005 21:16:31 -0000	1.11
--- bnp.extra	22 Jul 2005 06:26:06 -0000	1.12
***************
*** 2,31 ****
  #$Id$
  
  ifdef TINYOS_NP
    ifeq ($(TINYOS_NP),BNP)
  
      ifeq ($(TARGETS),mica2)
!       CFLAGS += -I%T/lib/Deluge
!       CFLAGS += -I%T/lib/Deluge/TOSBoot/include
!       BOOTLOADER ?= $(TOSDIR)/lib/Deluge/TOSBoot/bl_mica2.srec
        AVR_FUSE_H ?= 0xd8
      endif
  
      ifeq ($(TARGETS),mica2dot)
!       CFLAGS += -I%T/lib/Deluge
!       CFLAGS += -I%T/lib/Deluge/TOSBoot/include
!       BOOTLOADER ?= $(TOSDIR)/lib/Deluge/TOSBoot/bl_mica2dot.srec
        AVR_FUSE_H ?= 0xd8
      endif
  
      ifeq ($(TARGETS),micaz)
!       CFLAGS += -I%T/lib/Deluge
!       CFLAGS += -I%T/lib/Deluge/TOSBoot/include
!       BOOTLOADER ?= $(TOSDIR)/lib/Deluge/TOSBoot/bl_micaz.srec
        AVR_FUSE_H ?= 0xd8
      endif
  
      ifeq ($(TARGETS),pc)
!       CFLAGS += -I%T/../beta/Deluge/Deluge
        CFLAGS += -I%T/../beta/Deluge/pc
        CFLAGS += -I%T/lib/Flash
--- 2,31 ----
  #$Id$
  
+ DELUGE_DIR ?= %T/../beta/Deluge/Deluge
+ TOSBOOT_DIR ?= $(TOSDIR)/../beta/Deluge/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/../beta/Deluge/pc
        CFLAGS += -I%T/lib/Flash
***************
*** 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))
--- 38,46 ----
          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))
***************
*** 50,58 ****
  
      ifneq ($(filter telosb tmote,$(TARGETS)),)
!       CFLAGS += -I%T/../beta/Deluge/Deluge
        ifeq ($(filter docs,$(GOALS)),)
          CFLAGS += -Wl,--section-start=.text=0x4800,--defsym=_reset_vector__=0x4000
        endif
!       BOOTLOADER ?= $(TOSDIR)/../beta/Deluge/Deluge/TOSBoot/build/telosb/main.ihex
        ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
          BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
--- 50,58 ----
  
      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))