Fixed incorrect CALLBACK_USB_GetDescriptor() wIndex parameter type (thanks to matlo).

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

diff --git a/LUFA/Build/lufa_dfu.mk b/LUFA/Build/lufa_dfu.mk
index ba75f14..b19df05 100644 (file)
--- a/LUFA/Build/lufa_dfu.mk
+++ b/LUFA/Build/lufa_dfu.mk
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
 #
 #             LUFA Library

-#     Copyright (C) Dean Camera, 2012.
+#     Copyright (C) Dean Camera, 2015.

 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org
 #
 #  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_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.
 
 # -----------------------------------------------------------------------------
 #               LUFA DFU Bootloader Buildsystem Makefile Module.


@@ -62,32 +62,34 @@ MSG_COPY_CMD   := ' [CP]      :'
 MSG_REMOVE_CMD := ' [RM]      :'
 MSG_DFU_CMD    := ' [DFU]     :'
 
 MSG_REMOVE_CMD := ' [RM]      :'
 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 \"$<\"
 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
 
        batchisp -hardware usb -device $(MCU) -operation start reset 0
 

+# Programs in the target EEPROM memory using BATCHISP, the command line tool used by FLIP

 flip-ee: $(TARGET).eep $(MAKEFILE_LIST)
 flip-ee: $(TARGET).eep $(MAKEFILE_LIST)

-       @echo $(MSG_DFU_CMD) Copying EEP file to temporary file \"$<.hex\"
+       @echo $(MSG_COPY_CMD) Copying EEP file to temporary file \"$<.hex\"

        cp $< $<.hex
        @echo $(MSG_DFU_CMD) Programming EEPROM with batchisp using \"$<.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
        batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $<.hex program
        batchisp -hardware usb -device $(MCU) -operation start reset 0

-       @echo $(MSG_DFU_CMD) Removing temporary file \"$<.hex\"
+       @echo $(MSG_REMOVE_CMD) Removing temporary file \"$<.hex\"

        rm $<.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 \"$<\"
        dfu-programmer $(MCU) erase
        dfu-programmer $(MCU) flash $<
        dfu-programmer $(MCU) reset
 
 dfu: $(TARGET).hex $(MAKEFILE_LIST)
        @echo $(MSG_DFU_CMD) Programming FLASH with dfu-programmer using \"$<\"
        dfu-programmer $(MCU) erase
        dfu-programmer $(MCU) flash $<
        dfu-programmer $(MCU) reset
 

+# Programs in the target EEPROM memory using DFU-PROGRAMMER

 dfu-ee: $(TARGET).eep $(MAKEFILE_LIST)
        @echo $(MSG_DFU_CMD) Programming EEPROM with dfu-programmer using \"$<\"
 dfu-ee: $(TARGET).eep $(MAKEFILE_LIST)
        @echo $(MSG_DFU_CMD) Programming EEPROM with dfu-programmer using \"$<\"

-       dfu-programmer $(MCU) eeprom-flash $<
+       dfu-programmer $(MCU) flash --eeprom $<

        dfu-programmer $(MCU) reset
        dfu-programmer $(MCU) reset

-       
+

 # Phony build targets for this module
 .PHONY: flip flip-ee dfu dfu-ee
 # Phony build targets for this module
 .PHONY: flip flip-ee dfu dfu-ee