[Tinyos-2-commits] CVS: tinyos-2.x/support/make epic.target, 1.1, 1.2 tosboot.extra, 1.1, 1.2

[Razvan Musaloiu-E.]

Update of /cvsroot/tinyos/tinyos-2.x/support/make
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14951/support/make

Modified Files:
	epic.target tosboot.extra 
Log Message:
Deluge T2 support for Epic. This includes support for at45db161d and some refactoring and cleaning.


Index: epic.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/epic.target,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** epic.target	7 Aug 2008 06:37:34 -0000	1.1
--- epic.target	25 Aug 2008 16:48:45 -0000	1.2
***************
*** 12,18 ****
  MSP_BSL_FLAGS = --telosb
  
! #Update for Epic AT45 flash
! #VOLUME_FILE = volumes-stm25p.xml
! #VOLUME_ALLOCATOR = tos-storage-stm25p
  
  ifdef CC2420_CHANNEL
--- 12,17 ----
  MSP_BSL_FLAGS = --telosb
  
! VOLUME_FILE = volumes-at45db.xml
! VOLUME_ALLOCATOR ?= tos-storage-at45db
  
  ifdef CC2420_CHANNEL

Index: tosboot.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/tosboot.extra,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** tosboot.extra	19 Jun 2008 15:51:25 -0000	1.1
--- tosboot.extra	25 Aug 2008 16:48:45 -0000	1.2
***************
*** 11,20 ****
    CFLAGS += -I$(TOSDIR)/lib/net -I$(TOSDIR)/lib/net/drip -I$(DELUGE_DIR) -I$(DELUGE_DIR)/FlashVolumeManager -I$(DELUGE_DIR)/BlockStorageManager
  
!   ifneq ($(filter telosb tmote,$(TARGETS)),)
!     CFLAGS += -I$(DELUGE_EXTRA) -I$(DELUGE_EXTRA)/msp430 -I$(DELUGE_EXTRA)/telos -I$(DELUGE_EXTRA)/telosb
      ifeq ($(filter docs,$(GOALS)),)
        CFLAGS += -Wl,--section-start=.text=0x4a00,--defsym=_reset_vector__=0x4000
      endif
!     BOOTLOADER_IMG ?= $(TOSBOOT_DIR)/telosb/main.ihex
      ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
        BOOTLOADER_IMG := $(shell cygpath -m $(BOOTLOADER_IMG))
--- 11,27 ----
    CFLAGS += -I$(TOSDIR)/lib/net -I$(TOSDIR)/lib/net/drip -I$(DELUGE_DIR) -I$(DELUGE_DIR)/FlashVolumeManager -I$(DELUGE_DIR)/BlockStorageManager
  
!   ifneq ($(filter telosb tmote epic,$(TARGETS)),)
!     CFLAGS += -I$(DELUGE_EXTRA) -I$(DELUGE_EXTRA)/msp430 -I$(DELUGE_EXTRA)/telos
      ifeq ($(filter docs,$(GOALS)),)
        CFLAGS += -Wl,--section-start=.text=0x4a00,--defsym=_reset_vector__=0x4000
      endif
!     ifeq ($(TARGETS),telosb)
! 	CFLAGS += -I$(DELUGE_EXTRA)/telosb
! 	BOOTLOADER_IMG ?= $(TOSBOOT_DIR)/telosb/main.ihex
!     endif
!     ifeq ($(TARGETS),epic)
! 	CFLAGS += -I$(DELUGE_EXTRA)/epic
! 	BOOTLOADER_IMG ?= $(TOSBOOT_DIR)/epic/main.ihex
!     endif
      ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
        BOOTLOADER_IMG := $(shell cygpath -m $(BOOTLOADER_IMG))