[Tinyos-commits] CVS: tinyos-1.x/tools/make bnp.extra, 1.4, 1.5 telosb.target, 1.9, 1.10

[Jonathan Hui]

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

Modified Files:
	bnp.extra telosb.target 
Log Message:
Change PFLAGS to CFLAGS.



Index: bnp.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/bnp.extra,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bnp.extra	1 May 2005 07:23:13 -0000	1.4
--- bnp.extra	14 Jun 2005 15:08:40 -0000	1.5
***************
*** 6,11 ****
  
      ifeq ($(TARGETS),mica2)
!       PFLAGS += -I%T/lib/Deluge
!       PFLAGS += -I%T/lib/Deluge/TOSBoot/include
        BOOTLOADER ?= $(TOSDIR)/lib/Deluge/TOSBoot/bl_mica2.srec
        AVR_FUSE_H ?= 0xd8
--- 6,11 ----
  
      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
***************
*** 13,18 ****
  
      ifeq ($(TARGETS),mica2dot)
!       PFLAGS += -I%T/lib/Deluge
!       PFLAGS += -I%T/lib/Deluge/TOSBoot/include
        BOOTLOADER ?= $(TOSDIR)/lib/Deluge/TOSBoot/bl_mica2dot.srec
        AVR_FUSE_H ?= 0xd8
--- 13,18 ----
  
      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
***************
*** 20,25 ****
  
      ifeq ($(TARGETS),micaz)
!       PFLAGS += -I%T/lib/Deluge
!       PFLAGS += -I%T/lib/Deluge/TOSBoot/include
        BOOTLOADER ?= $(TOSDIR)/lib/Deluge/TOSBoot/bl_micaz.srec
        AVR_FUSE_H ?= 0xd8
--- 20,25 ----
  
      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
***************
*** 30,37 ****
          TARGETS := telosb
        else
!         PFLAGS += -I%T/lib/Deluge
!         PFLAGS += -I%T/lib/Deluge/TOSBoot/include
          ifeq ($(filter docs,$(GOALS)),)
!           PFLAGS += -Wl,--section-start=.text=0x3000,--defsym=_reset_vector__=0x1100
          endif
          BOOTLOADER ?= $(TOSDIR)/lib/Deluge/TOSBoot/bl_telos.ihex
--- 30,37 ----
          TARGETS := telosb
        else
!         CFLAGS += -I%T/lib/Deluge
!         CFLAGS += -I%T/lib/Deluge/TOSBoot/include
          ifeq ($(filter docs,$(GOALS)),)
!           CFLAGS += -Wl,--section-start=.text=0x3000,--defsym=_reset_vector__=0x1100
          endif
          BOOTLOADER ?= $(TOSDIR)/lib/Deluge/TOSBoot/bl_telos.ihex
***************
*** 43,49 ****
  
      ifneq ($(filter telosb tmote,$(TARGETS)),)
!       PFLAGS += -I%T/../beta/Deluge/Deluge
        ifeq ($(filter docs,$(GOALS)),)
!         PFLAGS += -Wl,--section-start=.text=0x5000,--defsym=_reset_vector__=0x4000
        endif
        BOOTLOADER ?= $(TOSDIR)/../beta/Deluge/Deluge/TOSBoot/build/telosb/main.ihex
--- 43,49 ----
  
      ifneq ($(filter telosb tmote,$(TARGETS)),)
!       CFLAGS += -I%T/../beta/Deluge/Deluge
        ifeq ($(filter docs,$(GOALS)),)
!         CFLAGS += -Wl,--section-start=.text=0x5000,--defsym=_reset_vector__=0x4000
        endif
        BOOTLOADER ?= $(TOSDIR)/../beta/Deluge/Deluge/TOSBoot/build/telosb/main.ihex

Index: telosb.target
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/telosb.target,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** telosb.target	13 Apr 2005 21:38:33 -0000	1.9
--- telosb.target	14 Jun 2005 15:08:40 -0000	1.10
***************
*** 7,20 ****
  
  # Disable MSP430 hardware multiply because it makes MSPGCC die
! PFLAGS += -mdisable-hwmul
  
  MSP_BSL_FLAGS = --telosb
  
! PFLAGS += \
  -I$(TOSDIR)/lib/CC2420Radio \
  -I$(TOSDIR)/../beta/STM25P/STM25P
  
  ifdef CC2420_CHANNEL
! PFLAGS += -DCC2420_DEF_CHANNEL=$(CC2420_CHANNEL)
  endif
  
--- 7,20 ----
  
  # Disable MSP430 hardware multiply because it makes MSPGCC die
! CFLAGS += -mdisable-hwmul
  
  MSP_BSL_FLAGS = --telosb
  
! CFLAGS += \
  -I$(TOSDIR)/lib/CC2420Radio \
  -I$(TOSDIR)/../beta/STM25P/STM25P
  
  ifdef CC2420_CHANNEL
! CFLAGS += -DCC2420_DEF_CHANNEL=$(CC2420_CHANNEL)
  endif