X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=support%2Fmake%2Favr%2Fmib510.extra;h=a7c9376b34c75782e33b85d005b3fc5444ca96b8;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hp=56c02fe2c43fc8e43f8d2992a665976cdff8a57b;hpb=4a57660b0c94816a2098e73375aaa7d85ae80ff5;p=tinyos-2.x.git

diff --git a/support/make/avr/mib510.extra b/support/make/avr/mib510.extra
index 56c02fe2..a7c9376b 100644
--- a/support/make/avr/mib510.extra
+++ b/support/make/avr/mib510.extra
@@ -6,27 +6,31 @@ $(error MIB510 must be defined, try "make $(TARGETS) help")
 endif
 
 PROGRAM = mib510
+
 ifeq ($(PROGRAMMER),avrdude)
-    ifdef BOOTLOADER
+    ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
+      MIB510 := '\\.\$(MIB510)'
+    endif
+    ifdef BOOTLOADER_IMG
       ifeq ($(shell [ -f /bin/cygwin1.dll ] && echo cygwin),cygwin)
-        BOOTLOADER := $(shell cygpath -m $(BOOTLOADER))
+        BOOTLOADER_IMG := $(shell cygpath -m $(BOOTLOADER_IMG))
       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
+    PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = -V -D -U flash:w:$(BOOTLOADER_IMG):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
+    PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = --upload if=$(BOOTLOADER_IMG) --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)