Device mode class driver callbacks are now fired before the control request status...

[pub/USBasp.git] / Bootloaders / TeensyHID / makefile

diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile
index 6f45cf5..404b55f 100644 (file)
--- a/Bootloaders/TeensyHID/makefile
+++ b/Bootloaders/TeensyHID/makefile
@@ -32,18 +32,6 @@
 # make program = Download the hex file to the device, using avrdude.\r
 #                Please customize the avrdude settings below first!\r
 #\r
-# make dfu = Download the hex file to the device, using dfu-programmer (must\r
-#            have dfu-programmer installed).\r
-#\r
-# make flip = Download the hex file to the device, using Atmel FLIP (must\r
-#             have Atmel FLIP installed).\r
-#\r
-# make dfu-ee = Download the eeprom file to the device, using dfu-programmer\r
-#               (must have dfu-programmer installed).\r
-#\r
-# make flip-ee = Download the eeprom file to the device, using Atmel FLIP\r
-#                (must have Atmel FLIP installed).\r
-#\r
 # make doxygen = Generate DoxyGen documentation for the project (must have\r
 #                DoxyGen installed)\r
 #\r
@@ -60,10 +48,10 @@
 \r
 \r
 # MCU name\r
-MCU = at90usb162\r
+MCU = atmega32u4\r
 \r
 \r
-# Target board (see library "Board Types" documentation, USER or blank for projects not requiring\r
+# Target board (see library "Board Types" documentation, NONE for projects not requiring\r
 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called \r
 # "Board" inside the application directory.\r
 BOARD  = \r
@@ -98,7 +86,7 @@ F_CLOCK = $(F_CPU)
 \r
 \r
 # Starting byte address of the bootloader\r
-BOOT_START = 0xC000\r
+BOOT_START = 0x7000\r
 \r
 \r
 # Output format. (can be srec, ihex, binary)\r
@@ -121,13 +109,14 @@ LUFA_PATH = ../..
 \r
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
-LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
 LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r
+LUFA_OPTS += -D NO_DEVICE_SELF_POWER\r
+LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
@@ -139,10 +128,10 @@ SRC = $(TARGET).c                                                 \
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/HostChapter9.c       \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Pipe.c               \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/USBInterrupt.c       \\r
+         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/Events.c            \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
-         $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \\r
 \r
 \r
 # List C++ source files here. (C dependencies are automatically generated.)\r
@@ -543,27 +532,6 @@ gccversion :
 program: $(TARGET).hex $(TARGET).eep\r
        $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)\r
 \r
-flip: $(TARGET).hex\r
-       batchisp -hardware usb -device $(MCU) -operation erase f\r
-       batchisp -hardware usb -device $(MCU) -operation loadbuffer $(TARGET).hex program\r
-       batchisp -hardware usb -device $(MCU) -operation start reset 0\r
-\r
-dfu: $(TARGET).hex\r
-       dfu-programmer $(MCU) erase\r
-       dfu-programmer $(MCU) flash --debug 1 $(TARGET).hex\r
-       dfu-programmer $(MCU) reset\r
-\r
-flip-ee: $(TARGET).hex $(TARGET).eep\r
-       $(COPY) $(TARGET).eep $(TARGET)eep.hex\r
-       batchisp -hardware usb -device $(MCU) -operation memory EEPROM erase\r
-       batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $(TARGET)eep.hex program\r
-       batchisp -hardware usb -device $(MCU) -operation start reset 0\r
-       $(REMOVE) $(TARGET)eep.hex\r
-\r
-dfu-ee: $(TARGET).hex $(TARGET).eep\r
-       dfu-programmer $(MCU) flash-eeprom --debug 1 --suppress-bootloader-mem $(TARGET).eep\r
-       dfu-programmer $(MCU) reset\r
-\r
 \r
 # Generate avr-gdb config/init file which does the following:\r
 #     define the reset signal, load the target file, connect to target, and set \r
@@ -741,5 +709,5 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 .PHONY : all checkinvalidevents showliboptions    \\r
 showtarget begin finish end sizebefore sizeafter  \\r
 gccversion build elf hex eep lss sym coff extcoff \\r
-program dfu flip flip-ee dfu-ee clean debug       \\r
-clean_list clean_binary gdb-config doxygen
\ No newline at end of file
+program clean debug clean_list clean_binary       \\r
+gdb-config doxygen
\ No newline at end of file