X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=support%2Fmake%2Favr%2Fdapa.extra;h=6717198d0e05960c45b9cffdd3afe01cc08f2325;hb=4a57660b0c94816a2098e73375aaa7d85ae80ff5;hp=54b982b246dd6284d3e182c1450870a087d4fae2;hpb=bcce1a8f390b5db080a8da9ef1ccc7d4716fea07;p=tinyos-2.x.git

diff --git a/support/make/avr/dapa.extra b/support/make/avr/dapa.extra
index 54b982b2..6717198d 100644
--- a/support/make/avr/dapa.extra
+++ b/support/make/avr/dapa.extra
@@ -1,19 +1,33 @@
 #-*-Makefile-*- vim:syntax=make
 #$Id$
 
+
+
+
+
 PROGRAM = dapa
-PROGRAMMER_FLAGS = -dprog=dapa --wr_fuse_h=$(AVR_FUSE_H) $(PROGRAMMER_PART) $(PROGRAMMER_EXTRA_FLAGS)
+
+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 with dapa"
-	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --erase 
-	sleep 1	     
-	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --upload if=$(INSTALL_SREC)
-	sleep 1	     
-	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --verify if=$(INSTALL_SREC)
+	@echo "    installing $(PLATFORM) binary using dapa"
+	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(PROGRAMMER_INSTALL_SREC_FLAGS)
 
 program_bl: FORCE
-	@echo "    installing $(PLATFORM) bootloader with dapa"
-	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --upload if=$(BOOTLOADER)
-	sleep 1	     
-	$(PROGRAMMER) $(PROGRAMMER_FLAGS) --verify if=$(BOOTLOADER)
+	@echo "    installing $(PLATFORM) bootloader using dapa"
+	$(PROGRAMMER) $(PROGRAMMER_FLAGS) $(PROGRAMMER_INSTALL_BOOTLOADER_FLAGS)