[Tinyos-commits] CVS: tinyos-1.x/tools/make/pxa27x install.extra, 1.1, 1.2 jtag.extra, 1.1, 1.2 pxa27x.rules, 1.2, 1.3 reinstall.extra, 1.1, 1.2

[Philip Buonadonna]

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

Modified Files:
	install.extra jtag.extra pxa27x.rules reinstall.extra 
Log Message:
- Updates to imote2 make environment


Index: install.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/install.extra,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** install.extra	23 Feb 2005 22:17:02 -0000	1.1
--- install.extra	10 Jun 2005 21:41:02 -0000	1.2
***************
*** 3,11 ****
  
  NODEID = $(INSTALL)
! BUILD_DEPS = ihex bytes program
  
- ifdef TINYOS_NP
-   ifeq ($(TINYOS_NP),BNP)
-     BUILD_DEPS = ihex bytes program_bl program_no_e
-   endif
- endif
--- 3,6 ----
  
  NODEID = $(INSTALL)
! BUILD_DEPS = setid bin bytes program
  

Index: jtag.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/jtag.extra,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** jtag.extra	23 Feb 2005 22:17:02 -0000	1.1
--- jtag.extra	10 Jun 2005 21:41:02 -0000	1.2
***************
*** 8,24 ****
  endif
  
  program: FORCE
  	@echo "    installing $(PLATFORM) binary using the parallel port jtag adapter"
! 	$(PXA27X_JTAG) -p imote2 $(MAIN_BIN)
! 
! program_no_e: FORCE
! 	@echo "    installing $(PLATFORM) binary using jtag (without mass erase)"
! 	$(MSP_JTAG) $(MSP_JTAG_FLAGS) -r -I -p $(INSTALL_IHEX)
  
- program_bl: FORCE
- 	@echo "    installing $(PLATFORM) bootloader using jtag"
- 	$(MSP_JTAG) $(MSP_JTAG_FLAGS) -r -e -I -p $(BOOTLOADER)
  
! program_input: ihex
  	@:
  
--- 8,21 ----
  endif
  
+ ifndef PXA27X_JTAG_DEV
+ PXA27X_JTAG_DEV = "\"JTAG CPU\""
+ endif
+ 
  program: FORCE
  	@echo "    installing $(PLATFORM) binary using the parallel port jtag adapter"
! 	$(PXA27X_JTAG) -p imote2 -tt $(PXA27X_JTAG_DEV) $(MAIN_BIN)
  
  
! program_input: bin
  	@:
  

Index: pxa27x.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/pxa27x.rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pxa27x.rules	18 May 2005 02:15:43 -0000	1.2
--- pxa27x.rules	10 Jun 2005 21:41:02 -0000	1.3
***************
*** 2,6 ****
  #$Id$
  
! define MSP_HELP
  
   PXA27x extras:
--- 2,6 ----
  #$Id$
  
! define PXA27X_HELP
  
   PXA27x extras:
***************
*** 9,16 ****
     debugopt : compile with debug symbols
    endef
! HELP += $(MSP_HELP)
  
  OBJCOPY = xscale-elf-objcopy
  OBJDUMP = xscale-elf-objdump
  XDB_SYMBOL_EXTRACT = dwarf2bd
  NCC = ncc
--- 9,17 ----
     debugopt : compile with debug symbols
    endef
! HELP += $(PXA27X_HELP)
  
  OBJCOPY = xscale-elf-objcopy
  OBJDUMP = xscale-elf-objdump
+ SET_ID = $(TINYOS_MAKE_PATH)/msp/set-mote-id
  XDB_SYMBOL_EXTRACT = dwarf2bd
  NCC = ncc
***************
*** 20,23 ****
--- 21,25 ----
  MAIN_EXE = $(BUILDDIR)/main.exe
  MAIN_BIN = $(BUILDDIR)/main.bin
+ INSTALL_BIN = $(MAIN_BIN).out$(if $(NODEID),-$(NODEID),)
  
  OPTFLAGS ?= -Os
***************
*** 39,48 ****
  ifndef BUILD_DEPS
    ifeq ($(filter $(BUILDLESS_DEPS),$(GOALS)),)
!     BUILD_DEPS = ihex bytes
    endif
  endif
  
! ihex: exe FORCE
! 	$(OBJCOPY) --output-target=binary $(MAIN_EXE) $(MAIN_BIN)
  	$(XDB_SYMBOL_EXTRACT) $(MAIN_EXE)
  
--- 41,52 ----
  ifndef BUILD_DEPS
    ifeq ($(filter $(BUILDLESS_DEPS),$(GOALS)),)
!     BUILD_DEPS = bin bytes $(POST_BUILD_EXTRA_DEPS)
    endif
  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
! 
! bin: exe FORCE
  	$(XDB_SYMBOL_EXTRACT) $(MAIN_EXE)
  

Index: reinstall.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tools/make/pxa27x/reinstall.extra,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** reinstall.extra	23 Feb 2005 22:17:02 -0000	1.1
--- reinstall.extra	10 Jun 2005 21:41:02 -0000	1.2
***************
*** 5,14 ****
  BUILD_DEPS = setid program
  
- ifdef TINYOS_NP
-   ifeq ($(TINYOS_NP),BNP)
-     BUILD_DEPS = setid program_bl program_no_e
-   endif
- endif
  
- check_bnp: FORCE
- 	@perl -e 'exit 0 if (<> =~ /^\:103000/); print "\nERROR: Trying to install with BNP support.\n       main.ihex was not built properly, please recompile.\n\n"; exit 1;' $(INSTALL_IHEX)
--- 5,7 ----