[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge/TOSBoot Makefile, 1.6, 1.7 TOSBoot.nc, 1.6, 1.7

[Jonathan Hui]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20677

Modified Files:
	Makefile TOSBoot.nc 
Log Message:
- Added support for at45db flash chip and telosa platform.



Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile	12 Jul 2005 20:09:08 -0000	1.6
--- Makefile	17 Jul 2005 20:53:18 -0000	1.7
***************
*** 32,44 ****
  
  PFLAGS += \
- -DDELUGE_LEDS \
  -I%T/../beta/Deluge/Deluge \
  -I%T/../beta/Deluge/Deluge/TOSBoot \
- -Imsp430 \
- -Istm25p \
- -DTOSBOOT_START=0x4000 \
- -DTOSBOOT_END=0x4800 \
  -DNESC_BUILD_BINARY \
  -Os
  
  include $(TOSDIR)/../apps/Makerules
--- 32,50 ----
  
  PFLAGS += \
  -I%T/../beta/Deluge/Deluge \
  -I%T/../beta/Deluge/Deluge/TOSBoot \
  -DNESC_BUILD_BINARY \
  -Os
  
+ ifeq ($(MAKECMDGOALS),telosa)
+   CFLAGS += -DTOSBOOT_START=0x1100 -DTOSBOOT_END=0x1a00
+   CFLAGS += -Iat45db -Imsp430 -Itelos
+ endif
+ 
+ ifeq ($(MAKECMDGOALS),telosb)
+   CFLAGS += -DTOSBOOT_START=0x4000 -DTOSBOOT_END=0x4800
+   CFLAGS += -Imsp430 -Istm25p -Itelosb
+ endif
+ 
+ 
  include $(TOSDIR)/../apps/Makerules

Index: TOSBoot.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/TOSBoot/TOSBoot.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TOSBoot.nc	8 Jul 2005 22:15:06 -0000	1.6
--- TOSBoot.nc	17 Jul 2005 20:53:18 -0000	1.7
***************
*** 41,56 ****
      TOSBootM,
      ExecC,
      InternalFlashC as IntFlash,
      LedsC,
      PluginC,
      ProgFlashM as ProgFlash,
-     STM25PC as ExtFlash,
      VoltageC;
  
!   TOSBootM.SubControl -> ExtFlash.StdControl;
    TOSBootM.SubControl -> PluginC;
  
    TOSBootM.Exec -> ExecC;
!   TOSBootM.ExtFlash -> ExtFlash;
    TOSBootM.IntFlash -> IntFlash;
    TOSBootM.Leds -> LedsC;
--- 41,56 ----
      TOSBootM,
      ExecC,
+     ExtFlashC,
      InternalFlashC as IntFlash,
      LedsC,
      PluginC,
      ProgFlashM as ProgFlash,
      VoltageC;
  
!   TOSBootM.SubControl -> ExtFlashC.StdControl;
    TOSBootM.SubControl -> PluginC;
  
    TOSBootM.Exec -> ExecC;
!   TOSBootM.ExtFlash -> ExtFlashC;
    TOSBootM.IntFlash -> IntFlash;
    TOSBootM.Leds -> LedsC;