Performance enhancements to tos.py, rename of TINYOS_NP=BNP to BOOTLOADER=tosboot...

[tinyos-2.x.git] / support / make / avr / dapa.extra

diff --git a/support/make/avr/dapa.extra b/support/make/avr/dapa.extra
index 20a6cb1583df8266857015f0745225298b7975b0..7bae57d608951334423bca12d8d8982f60ece6eb 100644 (file)
--- a/support/make/avr/dapa.extra
+++ b/support/make/avr/dapa.extra
@@ -8,20 +8,20 @@
 PROGRAM = dapa
 
 ifeq ($(PROGRAMMER),avrdude)
-    ifdef BOOTLOADER
+    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 = -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 = -V -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=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
+    PROGRAMMER_INSTALL_BOOTLOADER_FLAGS = --upload if=$(BOOTLOADER_IMG) --verify
 endif
 
 program: FORCE