[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/tosboot Makefile, 1.3, 1.4 TOSBootM.nc, 1.4, 1.5

[Razvan Musaloiu-E.]

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

Modified Files:
	Makefile TOSBootM.nc 
Log Message:
Deluge T2 support for Epic. This includes support for at45db161d and some refactoring and cleaning.


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosboot/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	11 Jun 2008 00:46:25 -0000	1.3
--- Makefile	25 Aug 2008 16:48:47 -0000	1.4
***************
*** 68,72 ****
  ifeq ($(MAKECMDGOALS),telosb)
    CFLAGS += -DTOSBOOT_START=0x4000 -DTOSBOOT_END=0x4a00
!   CFLAGS += -Imsp430 -Istm25p -Itelosb -Ilib
    CFLAGS += -I../net/Deluge
    POST_BUILD_EXTRA_DEPS += strip_iv
--- 68,79 ----
  ifeq ($(MAKECMDGOALS),telosb)
    CFLAGS += -DTOSBOOT_START=0x4000 -DTOSBOOT_END=0x4a00
!   CFLAGS += -Imsp430 -Imsp430f1611 -Istm25p -Itelosb -Ilib
!   CFLAGS += -I../net/Deluge
!   POST_BUILD_EXTRA_DEPS += strip_iv
! endif
! 
! ifeq ($(MAKECMDGOALS),epic)
!   CFLAGS += -DTOSBOOT_START=0x4000 -DTOSBOOT_END=0x4a00
!   CFLAGS += -Imsp430 -Imsp430f1611 -Iepic -Ilib
    CFLAGS += -I../net/Deluge
    POST_BUILD_EXTRA_DEPS += strip_iv

Index: TOSBootM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/tosboot/TOSBootM.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TOSBootM.nc	24 Jan 2008 21:02:05 -0000	1.4
--- TOSBootM.nc	25 Aug 2008 16:48:47 -0000	1.5
***************
*** 121,125 ****
  	if (i == 0)
  	  while (1)
! 	    call Leds.flash(1);
  	return FALSE;
        }
--- 121,125 ----
  	if (i == 0)
  	  while (1)
! 	    call Leds.flash(2);
  	return FALSE;
        }
***************
*** 148,152 ****
      curAddr = curAddr + 8;
  
! #if defined(PLATFORM_TELOSB)
      if (intAddr != TOSBOOT_END) {
  #elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)
--- 148,152 ----
      curAddr = curAddr + 8;
  
! #if defined(PLATFORM_TELOSB) || defined (PLATFORM_EPIC)
      if (intAddr != TOSBOOT_END) {
  #elif defined(PLATFORM_MICAZ) || defined(PLATFORM_IRIS)