[Tinyos-2-commits] CVS: tinyos-2.x/support/make/avr avr.rules, 1.6, 1.7 avrisp.extra, 1.4, 1.5 dapa.extra, 1.4, 1.5 eprb.extra, 1.4, 1.5 mib510.extra, 1.4, 1.5

Tue Nov 6 11:32:59 PST 2007

Update of /cvsroot/tinyos/tinyos-2.x/support/make/avr
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22965/avr

Modified Files:
	avr.rules avrisp.extra dapa.extra eprb.extra mib510.extra 
Log Message:
updated AVR specific makefiles with dual support for uisp and avrdude

Index: avr.rules
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/avr/avr.rules,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** avr.rules	17 Aug 2007 15:47:30 -0000	1.6
--- avr.rules	6 Nov 2007 19:32:56 -0000	1.7
***************
*** 13,17 ****

     dapa         : (default) use parallel port programmer
!    mib510,<dev> : use MIB510 serial port programming board at port <dev>
     eprb,<host>	: use EPRB at hostname <host>
     avrisp,<dev> : use AVRISP serial programmer at port <dev>
--- 13,17 ----

     dapa         : (default) use parallel port programmer
!    mib510,<dev> : use MIB510/MIB520 serial port programming board at port <dev>
     eprb,<host>	: use EPRB at hostname <host>
     avrisp,<dev> : use AVRISP serial programmer at port <dev>
***************
*** 27,35 ****
  OBJDUMP = avr-objdump
  SET_ID = tos-set-symbols
! PROGRAMMER = uisp
  NCC = ncc
  LIBS = -lm

  AMADDR = ActiveMessageAddressC\$$addr
  BUILDDIR = build/$(PLATFORM)
  MAIN_EXE = $(BUILDDIR)/main.exe
--- 27,40 ----
  OBJDUMP = avr-objdump
  SET_ID = tos-set-symbols
! PROGRAMMER ?= uisp
  NCC = ncc
  LIBS = -lm

+ 
  AMADDR = ActiveMessageAddressC\$$addr
+ # Uncomment the next two lines if you have a toolchain without the dollar sign
+ # patch. This needs nesc 1.2.8 or newer (1.2.9 is recommended).
+ #PFLAGS += -fnesc-separator=__
+ #AMADDR = ActiveMessageAddressC__addr
  BUILDDIR = build/$(PLATFORM)
  MAIN_EXE = $(BUILDDIR)/main.exe
***************
*** 45,52 ****
  endif

! ifndef DEFAULT_PROGRAM
! DEFAULT_PROGRAM = dapa
  endif

  BUILDLESS_DEPS += bytes 

--- 50,76 ----
  endif

! AVRGCCMAJOR = $(shell avr-gcc -v 2>&1 | grep "gcc version" | sed -n 's/gcc version \([2-5]\)\.\([0-9]\)\.\([0-9]\).*/\1/p')
! ifeq ($(AVRGCCMAJOR),4)
!   PFLAGS += --param max-inline-insns-single=100000
! else
!   PFLAGS += -finline-limit=100000
  endif

+ ifeq ($(PROGRAMMER),avrdude)
+   AVRDUDE_CONF ?= /etc/avrdude/avrdude.conf
+   ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
+     AVRDUDE_CONF := $(shell cygpath -m $(AVRDUDE_CONF))
+   endif
+   PROGRAMMER_EXTRA_FLAGS += -C$(AVRDUDE_CONF)
+ #  PROGRAMMER_EXTRA_FLAGS += -v -v
+ endif
+ 
+ ifdef DEFAULT_PROGRAM_AVR
+ DEFAULT_PROGRAM = $(DEFAULT_PROGRAM_AVR)
+ endif
+ DEFAULT_PROGRAM ?= dapa
+ 
+ 
+ 
  BUILDLESS_DEPS += bytes 

Index: avrisp.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/avr/avrisp.extra,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** avrisp.extra	12 Dec 2006 18:22:59 -0000	1.4
--- avrisp.extra	6 Nov 2007 19:32:56 -0000	1.5
***************
*** 7,17 ****

  PROGRAM = avrisp
! PROGRAMMER_FLAGS=-dprog=stk500 -dserial=$(AVRISP) --wr_fuse_h=$(AVR_FUSE_H) $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS_AVRISP)

  program: FORCE
  	@echo "    installing $(PLATFORM) binary using avrisp"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --erase --upload if=$(INSTALL_SREC)

  program_bl: FORCE
  	@echo "    installing $(PLATFORM) bootloader using avrisp"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --upload if=$(BOOTLOADER)
\ No newline at end of file
--- 7,33 ----

  PROGRAM = avrisp
! 
! ifeq ($(PROGRAMMER),avrdude)
!     ifdef BOOTLOADER
!       ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
!         BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
!       endif
!     endif
!     PROGRAMMER_FLAGS = -cstk500 -P$(MIB510) -U hfuse:w:$(AVR_FUSE_H):m $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS) $(PROGRAMMER_EXTRA_FLAGS_AVRISP)
!     PROGRAMMER_INSTALL_SREC_FLAGS = -U flash:w:$(INSTALL_SREC):a
!     PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = -D -U flash:w:$(BOOTLOADER):a
! endif
! 
! ifeq ($(PROGRAMMER),uisp)
!     PROGRAMMER_FLAGS = -dprog=stk500 -dserial=$(AVRISP) --wr_fuse_h=$(AVR_FUSE_H) $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS) $(PROGRAMMER_EXTRA_FLAGS_AVRISP)
!     PROGRAMMER_INSTALL_SREC_FLAGS = --erase --upload if=$(INSTALL_SREC) --verify
!     PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = --upload if=$(BOOTLOADER) --verify
! endif

  program: FORCE
  	@echo "    installing $(PLATFORM) binary using avrisp"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(PROGRAMMER_INSTALL_SREC_FLAGS)

  program_bl: FORCE
  	@echo "    installing $(PLATFORM) bootloader using avrisp"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(PROGRAMMER_INSTALL_BOOTLOADER_FLAGS)

Index: dapa.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/avr/dapa.extra,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dapa.extra	12 Dec 2006 18:22:59 -0000	1.4
--- dapa.extra	6 Nov 2007 19:32:56 -0000	1.5
***************
*** 2,19 ****
  #$Id$

  PROGRAM = dapa
! PROGRAMMER_FLAGS = -dprog=dapa --wr_fuse_h=$(AVR_FUSE_H) $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS)

  program: FORCE
! 	@echo "    installing $(PLATFORM) binary with dapa"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --erase 
! 	sleep 1	     
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --upload if=$(INSTALL_SREC)
! 	sleep 1	     
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --verify if=$(INSTALL_SREC)

  program_bl: FORCE
! 	@echo "    installing $(PLATFORM) bootloader with dapa"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --upload if=$(BOOTLOADER)
! 	sleep 1	     
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --verify if=$(BOOTLOADER)
--- 2,33 ----
  #$Id$

+ 
+ 
+ 
+ 
  PROGRAM = dapa
! 
! ifeq ($(PROGRAMMER),avrdude)
!     ifdef BOOTLOADER
!       ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
!         BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
!       endif
!     endif
!     PROGRAMMER_FLAGS = -cdapa               -U hfuse:w:$(AVR_FUSE_H):m $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS) $(PROGRAMMER_EXTRA_FLAGS_MIB)
!     PROGRAMMER_INSTALL_SREC_FLAGS = -U flash:w:$(INSTALL_SREC):a
!     PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = -D -U flash:w:$(BOOTLOADER):a
! endif
! 
! ifeq ($(PROGRAMMER),uisp)
!     PROGRAMMER_FLAGS = -dprog=dapa                      --wr_fuse_h=$(AVR_FUSE_H) $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS) $(PROGRAMMER_EXTRA_FLAGS_MIB)
!     PROGRAMMER_INSTALL_SREC_FLAGS = --erase --upload if=$(INSTALL_SREC) --verify
!     PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = --upload if=$(BOOTLOADER) --verify
! endif

  program: FORCE
! 	@echo "    installing $(PLATFORM) binary using dapa"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(PROGRAMMER_INSTALL_SREC_FLAGS)

  program_bl: FORCE
! 	@echo "    installing $(PLATFORM) bootloader using dapa"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(PROGRAMMER_INSTALL_BOOTLOADER_FLAGS)

Index: eprb.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/avr/eprb.extra,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** eprb.extra	12 Dec 2006 18:22:59 -0000	1.4
--- eprb.extra	6 Nov 2007 19:32:56 -0000	1.5
***************
*** 7,17 ****

  PROGRAM = eprb
! PROGRAMMER_FLAGS = -dprog=stk500 -dhost=$(EPRB) --wr_fuse_h=$(AVR_FUSE_H) $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS_STK)

  program: FORCE
  	@echo "    installing $(PLATFORM) binary using eprb"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --erase --upload if=$(INSTALL_SREC)

  program_bl: FORCE
  	@echo "    installing $(PLATFORM) bootloader using eprb"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --upload if=$(BOOTLOADER)
--- 7,33 ----

  PROGRAM = eprb
! 
! ifeq ($(PROGRAMMER),avrdude)
!     ifdef BOOTLOADER
!       ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
!         BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
!       endif
!     endif
!     PROGRAMMER_FLAGS = -cstk500 -P$(EPRB)   -U hfuse:w:$(AVR_FUSE_H):m $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS) $(PROGRAMMER_EXTRA_FLAGS_STK)
!     PROGRAMMER_INSTALL_SREC_FLAGS = -U flash:w:$(INSTALL_SREC):a
!     PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = -D -U flash:w:$(BOOTLOADER):a
! endif
! 
! ifeq ($(PROGRAMMER),uisp)
!     PROGRAMMER_FLAGS = -dprog=stk500 -dhost=$(EPRB)     --wr_fuse_h=$(AVR_FUSE_H) $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS) $(PROGRAMMER_EXTRA_FLAGS_STK)
!     PROGRAMMER_INSTALL_SREC_FLAGS = --erase --upload if=$(INSTALL_SREC) --verify
!     PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = --upload if=$(BOOTLOADER) --verify
! endif

  program: FORCE
  	@echo "    installing $(PLATFORM) binary using eprb"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(PROGRAMMER_INSTALL_SREC_FLAGS)

  program_bl: FORCE
  	@echo "    installing $(PLATFORM) bootloader using eprb"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(PROGRAMMER_INSTALL_BOOTLOADER_FLAGS)

Index: mib510.extra
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/make/avr/mib510.extra,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** mib510.extra	12 Dec 2006 18:22:59 -0000	1.4
--- mib510.extra	6 Nov 2007 19:32:56 -0000	1.5
***************
*** 7,17 ****

  PROGRAM = mib510
! PROGRAMMER_FLAGS = -dprog=mib510 -dserial=$(MIB510) --wr_fuse_h=$(AVR_FUSE_H) $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS_MIB)

  program: FORCE
  	@echo "    installing $(PLATFORM) binary using mib510"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --erase --upload if=$(INSTALL_SREC)
! 
  program_bl: FORCE
  	@echo "    installing $(PLATFORM) bootloader using mib510"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --upload if=$(BOOTLOADER)
\ No newline at end of file
--- 7,32 ----

  PROGRAM = mib510
! ifeq ($(PROGRAMMER),avrdude)
!     ifdef BOOTLOADER
!       ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
!         BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
!       endif
!     endif
!     PROGRAMMER_FLAGS = -cmib510 -P$(MIB510) -U hfuse:w:$(AVR_FUSE_H):m $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS) $(PROGRAMMER_EXTRA_FLAGS_MIB)
!     PROGRAMMER_INSTALL_SREC_FLAGS = -U flash:w:$(INSTALL_SREC):a
!     PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = -D -U flash:w:$(BOOTLOADER):a
! endif
! 
! ifeq ($(PROGRAMMER),uisp)
!     PROGRAMMER_FLAGS = -dprog=mib510 -dserial=$(MIB510) --wr_fuse_h=$(AVR_FUSE_H) $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS) $(PROGRAMMER_EXTRA_FLAGS_MIB)
!     PROGRAMMER_INSTALL_SREC_FLAGS = --erase --upload if=$(INSTALL_SREC) --verify
!     PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = --upload if=$(BOOTLOADER) --verify
! endif

  program: FORCE
  	@echo "    installing $(PLATFORM) binary using mib510"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(PROGRAMMER_INSTALL_SREC_FLAGS)
! 	
  program_bl: FORCE
  	@echo "    installing $(PLATFORM) bootloader using mib510"
! 	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(PROGRAMMER_INSTALL_BOOTLOADER_FLAGS)