[Tinyos-commits] CVS: tinyos-1.x/tools/make/pxa27x bootloader.extra, 1.2, 1.3 debug.extra, 1.1, 1.2 debugopt.extra, 1.2, 1.3 install.extra, 1.3, 1.4 jtag.extra, 1.4, 1.5 reinstall.extra, 1.3, 1.4 usbinstall.extra, 1.2, 1.3 usbreinstall.extra, 1.2, 1.3 pxa27x.rules, 1.8, 1.9

[Lama Nachman]

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

Modified Files:
	bootloader.extra debug.extra debugopt.extra install.extra 
	jtag.extra reinstall.extra usbinstall.extra usbreinstall.extra 
	pxa27x.rules 
Log Message:
Latest internal push


Index: bootloader.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/bootloader.extra,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bootloader.extra	14 Jul 2006 19:44:43 -0000	1.2
--- bootloader.extra	5 Mar 2007 01:06:30 -0000	1.3
***************
*** 9,13 ****
  BOOTLOADER = present
  
! PXA27X_JTAG ?= $(TOSDIR)/../contrib/imote2/tools/bin/USBLoaderHost.exe
  
  program: FORCE
--- 9,13 ----
  BOOTLOADER = present
  
! PXA27X_JTAG ?= $(TOSDIR)/../../../public/tinyos-1.x/contrib/imote2/tools/bin/USBLoaderHost.exe
  
  program: FORCE




Index: jtag.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/jtag.extra,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** jtag.extra	13 Jun 2005 19:53:43 -0000	1.4
--- jtag.extra	5 Mar 2007 01:06:30 -0000	1.5
***************
*** 4,8 ****
  PROGRAM = jtag
  
! PXA27X_JTAG ?= c:/nordheim/xflash/xflash.exe
  PXA27X_JTAG_DEV ?= "JTAG CPU"
  
--- 4,13 ----
  PROGRAM = jtag
  
! INTEL_SDT_HOME ?= c:/nordheim
! empty :=
! XFLASH_PATH := $(subst $(empty) $(empty),\ ,$(subst \,/,$(INTEL_SDT_HOME)))
! PXA27X_JTAG ?= $(XFLASH_PATH)/xflash/xflash.exe
! 
! 
  PXA27X_JTAG_DEV ?= "JTAG CPU"
  
***************
*** 11,15 ****
  	$(PXA27X_JTAG) -p imote2 -tt $(PXA27X_JTAG_DEV) $(INSTALL_BIN)
  
- 
  program_input: bin
  	@:
--- 16,19 ----


Index: usbinstall.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/usbinstall.extra,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** usbinstall.extra	14 Jul 2006 19:44:43 -0000	1.2
--- usbinstall.extra	5 Mar 2007 01:06:30 -0000	1.3
***************
*** 4,8 ****
  #Installation using boot loader.
  
! INSTALL_PROGRAM = bootloader
  NODEID = $(INSTALL)
  BUILD_DEPS = bin program
--- 4,8 ----
  #Installation using boot loader.
  
! BOOT_INSTALL = TRUE
  NODEID = $(INSTALL)
  BUILD_DEPS = bin program

Index: usbreinstall.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/usbreinstall.extra,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** usbreinstall.extra	14 Jul 2006 19:44:43 -0000	1.2
--- usbreinstall.extra	5 Mar 2007 01:06:30 -0000	1.3
***************
*** 4,8 ****
  #Installation using boot loader.
  
! INSTALL_PROGRAM = bootloader
  NODEID = $(INSTALL)
  BUILD_DEPS = program
--- 4,8 ----
  #Installation using boot loader.
  
! BOOT_INSTALL = TRUE
  NODEID = $(INSTALL)
  BUILD_DEPS = program

Index: pxa27x.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/pxa27x.rules,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** pxa27x.rules	14 Jul 2006 19:15:33 -0000	1.8
--- pxa27x.rules	5 Mar 2007 01:06:31 -0000	1.9
***************
*** 31,35 ****
  MOTELIB_DIRS += $(PLATFORM_DIR)/lib
  
! OPTFLAGS ?= -O3 -g
  PFLAGS += -Wall -Wshadow -DDEF_TOS_AM_GROUP=$(DEFAULT_LOCAL_GROUP) $(NESC_FLAGS)
  PFLAGS += -target=$(PLATFORM) -fnesc-cfile=$(BUILDDIR)/app.c -board=$(SENSORBOARD)
--- 31,64 ----
  MOTELIB_DIRS += $(PLATFORM_DIR)/lib
  
! OPTFLAGS ?= -O1 -g
! 
! #OPTFLAGS ?= -fmerge-constants -fthread-jumps -floop-optimize -fif-conversion -fif-conversion2 -fguess-branch-probability -fcprop-registers -g
! 
! ifdef PROFILE_ATOMIC_TIME
! 	PFLAGS += -DPROFILE_ATOMIC_TIME
! endif
! 
! ifdef ASSERT_IRQ_TIME
! 	PFLAGS += -DASSERT_IRQ_TIME
! 	PFLAGS += -DIRQ_TIME_LIMIT=325 
! endif
! 
! ifdef PROFILE_IRQ_TIME
! 	PFLAGS += -DPROFILE_IRQ_TIME
! endif
! 
! ifdef ENABLE_TRACE
! 	PFLAGS += -DENABLE_TRACE=$(ENABLE_TRACE)
! endif	
! 
! ifdef SYSTEM_CORE_FREQUENCY
! 	PFLAGS += -DSYSTEM_CORE_FREQUENCY=$(SYSTEM_CORE_FREQUENCY)
! endif	
! 
! ifdef SYSTEM_BUS_FREQUENCY
! 	PFLAGS += -DSYSTEM_BUS_FREQUENCY=$(SYSTEM_BUS_FREQUENCY)
! endif	
! 
! 
  PFLAGS += -Wall -Wshadow -DDEF_TOS_AM_GROUP=$(DEFAULT_LOCAL_GROUP) $(NESC_FLAGS)
  PFLAGS += -target=$(PLATFORM) -fnesc-cfile=$(BUILDDIR)/app.c -board=$(SENSORBOARD)
***************
*** 69,72 ****
--- 98,102 ----
  endif
  
+ 
  setid: FORCE
  	@cmd () { echo "$$@"; $$@; }; if [ x = x$(NODEID) ]; then cmd $(OBJCOPY) --output-target=binary $(MAIN_EXE) $(INSTALL_BIN); else cmd $(SET_ID) --objcopy $(OBJCOPY) --objdump $(OBJDUMP) --target binary $(MAIN_EXE) $(INSTALL_BIN) $(NODEID); fi
***************
*** 76,80 ****
  
  bin: exe objcopy FORCE
! 	$(XDB_SYMBOL_EXTRACT) $(MAIN_EXE)
  
  exe: exe0 bytes FORCE
--- 106,110 ----
  
  bin: exe objcopy FORCE
! 	$(XDB_SYMBOL_EXTRACT) -nc $(MAIN_EXE)
  
  exe: exe0 bytes FORCE