Fix TeensyHID bootloader - change vendor page in the descriptors to match the undocum...

[pub/USBasp.git] / Projects / AVRISP / makefile

diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile
index 35e1e42..2b6a1e8 100644 (file)
--- a/Projects/AVRISP/makefile
+++ b/Projects/AVRISP/makefile
@@ -66,7 +66,7 @@ MCU = at90usb1287
 # Target board (see library "Board Types" documentation, USER or blank 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  = USBKEY\r
+BOARD = USBKEY\r
 \r
 \r
 # Processor frequency.\r
@@ -116,8 +116,7 @@ LUFA_PATH = ../../
 \r
 \r
 # LUFA library compile-time options\r
-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
-LUFA_OPTS += -D USB_DEVICE_ONLY\r
+LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=16\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
@@ -130,7 +129,11 @@ SRC = $(TARGET).c                                                 \
          Descriptors.c                                               \\r
       Lib/V2Protocol.c                                            \\r
       Lib/V2ProtocolParams.c                                      \\r
-      Lib/V2ProtocolTarget.c                                      \\r
+      Lib/ISPProtocol.c                                           \\r
+      Lib/ISPTarget.c                                             \\r
+         Lib/PDIProtocol.c                                           \\r
+         Lib/PDITarget.c                                             \\r
+         Lib/NVMTarget.c                                             \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r
@@ -188,9 +191,12 @@ CSTANDARD = -std=gnu99
 # Place -D or -U options here for C sources\r
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
 CDEFS += -DRESET_LINE_PORT=PORTB\r
+CDEFS += -DRESET_LINE_PIN=PINB\r
 CDEFS += -DRESET_LINE_DDR=DDRB\r
 CDEFS += -DRESET_LINE_MASK="(1 << 4)"\r
 CDEFS += -DVTARGET_ADC_CHANNEL=2\r
+CDEFS += -DENABLE_ISP_PROTOCOL\r
+CDEFS += -DENABLE_PDI_PROTOCOL\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r
@@ -512,7 +518,7 @@ $(LUFA_PATH)/LUFA/LUFA_Events.lst:
 checkinvalidevents: $(LUFA_PATH)/LUFA/LUFA_Events.lst\r
        @echo\r
        @echo Checking for invalid events...\r
-       @$(shell) avr-nm $(TARGET).elf | sed -n -e 's/^.*EVENT_/EVENT_/p' | \\r
+       @$(shell) avr-nm $(OBJ) | sed -n -e 's/^.*EVENT_/EVENT_/p' | \\r
                         grep -F -v --file=$(LUFA_PATH)/LUFA/LUFA_Events.lst > InvalidEvents.tmp || true\r
        @sed -n -e 's/^/  WARNING - INVALID EVENT NAME: /p' InvalidEvents.tmp\r
        @if test -s InvalidEvents.tmp; then exit 1; fi\r