[Tinyos-commits] CVS: tinyos-1.x/tools/make/pxa27x usbinstall.extra, NONE, 1.1 usbreinstall.extra, NONE, 1.1 bootloader.extra, NONE, 1.1 pxa27x.rules, 1.7, 1.8

[Robbie Adler]

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

Modified Files:
	pxa27x.rules 
Added Files:
	usbinstall.extra usbreinstall.extra bootloader.extra 
Log Message:
latest tinyos make system files


--- NEW FILE: usbinstall.extra ---
#-*-Makefile-*- vim:syntax=make
#$Id: usbinstall.extra,v 1.1 2006/07/14 19:15:29 radler Exp $

#Installation using boot loader.

BOOT_INSTALL = TRUE
NODEID = $(INSTALL)
BUILD_DEPS = bin program

--- NEW FILE: usbreinstall.extra ---
#-*-Makefile-*- vim:syntax=make
#$Id: usbreinstall.extra,v 1.1 2006/07/14 19:15:33 radler Exp $

#Installation using boot loader.

BOOT_INSTALL = TRUE
NODEID = $(INSTALL)
BUILD_DEPS = program

--- NEW FILE: bootloader.extra ---
#-*-Makefile-*- vim:syntax=make
#$Id: bootloader.extra,v 1.1 2006/07/14 19:15:33 radler Exp $

#Temporary change for enabling an isolated compile option
#for bootloader.

PROGRAM = bootloader

BOOTLOADER = present

PXA27X_JTAG ?= $(TOSDIR)/../../../public/tinyos-1.x/contrib/imote2/tools/bin/USBLoaderHost.exe

program: FORCE
	@echo "    installing $(PLATFORM) binary using the USB boot loader"
	$(PXA27X_JTAG) -p $(INSTALL_BIN)

program_input: bin
	@:

Index: pxa27x.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/pxa27x.rules,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pxa27x.rules	18 Oct 2005 21:34:25 -0000	1.7
--- pxa27x.rules	14 Jul 2006 19:15:33 -0000	1.8
***************
*** 28,34 ****
  ASSEMBLY_OBJS =  $(BUILDDIR)/asms.o
  
! MOTELIB = $(PLATFORM_DIR)/lib/libimote2.a
! #MOTELIB =  $(PLATFORM_DIR)/lib/profile.o $(PLATFORM_DIR)/lib/queue.o
! 
  
  OPTFLAGS ?= -O3 -g
--- 28,33 ----
  ASSEMBLY_OBJS =  $(BUILDDIR)/asms.o
  
! MOTELIBS += $(PLATFORM_DIR)/lib/libimote2.a
! MOTELIB_DIRS += $(PLATFORM_DIR)/lib
  
  OPTFLAGS ?= -O3 -g
***************
*** 36,39 ****
--- 35,40 ----
  PFLAGS += -target=$(PLATFORM) -fnesc-cfile=$(BUILDDIR)/app.c -board=$(SENSORBOARD)
  
+ #CFLAGS += -mapcs
+ 
  ifdef MSG_SIZE
  PFLAGS += -DTOSH_DATA_LENGTH=$(MSG_SIZE)
***************
*** 47,50 ****
--- 48,65 ----
  $(if $(PROGRAM),,$(call TOSMake_include,pxa27x/$(INSTALL_PROGRAM).extra))
  
+ # Boot Loader changes are moved in to the default compile, however it
+ # is easier to have a way to eliminate the boot loader changes if required.
+ # Uncommenting the IFDEF will require an extra compile time flag to include
+ # the boot loader changes.
+ # The changes are 
+ #   barcert.s - Defines a new linker section for reset handler.
+ #   PXA27XUSBClientM.nc - Added Message type of boot loader.
+ # If uncommented the Usage is: make imote2 bootloader.
+ # - Junaith
+ 
+ #ifdef BOOTLOADER
+ ASFLAGS += -defsym BOOTLOADER=1
+ PFLAGS += -DBOOTLOADER
+ #endif
  
  ifndef BUILD_DEPS
***************
*** 68,72 ****
  exe0: builddir asms library $(BUILD_EXTRA_DEPS) FORCE
  	@echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
! 	$(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS) $(ASSEMBLY_OBJS) $(MOTELIB)
  	@echo "    compiled $(COMPONENT) to $(MAIN_EXE)"
  
--- 83,87 ----
  exe0: builddir asms library $(BUILD_EXTRA_DEPS) FORCE
  	@echo "    compiling $(COMPONENT) to a $(PLATFORM) binary"
! 	$(NCC) -o $(MAIN_EXE) $(OPTFLAGS) $(PFLAGS) $(CFLAGS) $(COMPONENT).nc $(LIBS) $(LDFLAGS) $(ASSEMBLY_OBJS) $(MOTELIBS)
  	@echo "    compiled $(COMPONENT) to $(MAIN_EXE)"
  
***************
*** 75,82 ****
  
  bytes: FORCE
! 	@objdump -h $(MAIN_EXE) | perl -ne '$$b{$$1}=hex $$2 if /^\s*\d+\s*\.(text|data|bss)\s+(\S+)/; END { printf("%16d bytes in ROM\n%16d bytes in RAM\n",$$b{text}+$$b{data},$$b{data}+$$b{bss}); }'
  
  asms: 
  	$(AS) $(ASFLAGS) $(ASSEMBLY_FILES) -o $(BUILDDIR)/asms.o
  library:
! 	cd $(PLATFORM_DIR)/lib; make;
\ No newline at end of file
--- 90,98 ----
  
  bytes: FORCE
! 	@objdump -h $(MAIN_EXE) | perl -ne '$$b{$$1}=hex $$2 if /^\s*\d+\s*\.(text|data|bss|stack)\s+(\S+)/; END { printf("%16d bytes in ROM\n%16d bytes in RAM\n%16d bytes in STACK\n%16d bytes available in HEAP\n",$$b{text}+$$b{data},$$b{data}+$$b{bss},$$b{stack},262144-$$b{data}-$$b{bss}-$$b{stack} ); }'
  
  asms: 
  	$(AS) $(ASFLAGS) $(ASSEMBLY_FILES) -o $(BUILDDIR)/asms.o
  library:
! 	$(foreach i,$(MOTELIB_DIRS),cd $(i); make;)
! #cd $(PLATFORM_DIR)/lib; make;