Update to latest Atmel Studio integration binary.

[pub/lufa.git] / LUFA / Build / lufa_dfu.mk

diff --git a/LUFA/Build/lufa_dfu.mk b/LUFA/Build/lufa_dfu.mk
index 36c8461..956adc8 100644 (file)
--- a/LUFA/Build/lufa_dfu.mk
+++ b/LUFA/Build/lufa_dfu.mk
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
-#     Copyright (C) Dean Camera, 2012.
+#     Copyright (C) Dean Camera, 2014.
 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org
@@ -9,9 +9,9 @@
 LUFA_BUILD_MODULES         += DFU
 LUFA_BUILD_TARGETS         += flip flip-ee dfu dfu-ee
 LUFA_BUILD_MANDATORY_VARS  += MCU TARGET
-LUFA_BUILD_OPTIONAL_VARS   += 
-LUFA_BUILD_PROVIDED_VARS   += 
-LUFA_BUILD_PROVIDED_MACROS += 
+LUFA_BUILD_OPTIONAL_VARS   +=
+LUFA_BUILD_PROVIDED_VARS   +=
+LUFA_BUILD_PROVIDED_MACROS +=
 
 # -----------------------------------------------------------------------------
 #               LUFA DFU Bootloader Buildsystem Makefile Module.
@@ -65,8 +65,7 @@ MSG_DFU_CMD    := ' [DFU]     :'
 # Programs in the target FLASH memory using BATCHISP, the command line tool used by FLIP
 flip: $(TARGET).hex $(MAKEFILE_LIST)
        @echo $(MSG_DFU_CMD) Programming FLASH with batchisp using \"$<\"
-       batchisp -hardware usb -device $(MCU) -operation erase f
-       batchisp -hardware usb -device $(MCU) -operation loadbuffer $< program
+       batchisp -hardware usb -device $(MCU) -operation erase f loadbuffer $< program
        batchisp -hardware usb -device $(MCU) -operation start reset 0
 
 # Programs in the target EEPROM memory using BATCHISP, the command line tool used by FLIP
@@ -74,12 +73,11 @@ flip-ee: $(TARGET).eep $(MAKEFILE_LIST)
        @echo $(MSG_COPY_CMD) Copying EEP file to temporary file \"$<.hex\"
        cp $< $<.hex
        @echo $(MSG_DFU_CMD) Programming EEPROM with batchisp using \"$<.hex\"
-       batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase
        batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $<.hex program
        batchisp -hardware usb -device $(MCU) -operation start reset 0
        @echo $(MSG_REMOVE_CMD) Removing temporary file \"$<.hex\"
        rm $<.hex
-       
+
 # Programs in the target FLASH memory using DFU-PROGRAMMER
 dfu: $(TARGET).hex $(MAKEFILE_LIST)
        @echo $(MSG_DFU_CMD) Programming FLASH with dfu-programmer using \"$<\"
@@ -92,6 +90,6 @@ dfu-ee: $(TARGET).eep $(MAKEFILE_LIST)
        @echo $(MSG_DFU_CMD) Programming EEPROM with dfu-programmer using \"$<\"
        dfu-programmer $(MCU) eeprom-flash $<
        dfu-programmer $(MCU) reset
-       
+
 # Phony build targets for this module
 .PHONY: flip flip-ee dfu dfu-ee