Minor updates to the Benito programmer - remove redundant PORT register manipulations.

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

diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index cb19cb6..def34aa 100644 (file)
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -51,10 +51,10 @@
 MCU = at90usb1287\r
 \r
 \r
-# Target board (see library BoardTypes.h documentation, USER or blank for projects not requiring\r
+# 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
@@ -89,7 +89,11 @@ F_CPU = 8000000
 #\r
 #     If no clock division is performed on the input clock inside the AVR (via the\r
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.\r
-F_CLOCK = 8000000\r
+F_CLOCK = $(F_CPU)\r
+\r
+\r
+# Starting byte address of the bootloader\r
+BOOT_START = 0x1E000\r
 \r
 \r
 # Output format. (can be srec, ihex, binary)\r
@@ -106,17 +110,36 @@ TARGET = BootloaderDFU
 OBJDIR = .\r
 \r
 \r
+# Path to the LUFA library\r
+LUFA_PATH = ../..\r
+\r
+\r
+# LUFA library compile-time options\r
+LUFA_OPTS  = -D USB_DEVICE_ONLY\r
+LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
+LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32\r
+LUFA_OPTS += -D TOTAL_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
+\r
+\r
 # List C source files here. (C dependencies are automatically generated.)\r
-SRC = $(TARGET).c                                          \\r
-         Descriptors.c                                        \\r
-         ../../LUFA/Drivers/USB/LowLevel/LowLevel.c           \\r
-         ../../LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
-         ../../LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
-         ../../LUFA/Drivers/USB/HighLevel/USBTask.c           \\r
-         ../../LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \\r
-         ../../LUFA/Drivers/USB/HighLevel/Events.c            \\r
-         ../../LUFA/Drivers/USB/HighLevel/StdDescriptors.c    \\r
-         \r
+SRC = $(TARGET).c                                                 \\r
+         Descriptors.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
+         $(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/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
 CPPSRC = \r
 \r
@@ -148,7 +171,7 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.\r
 #     Use forward slashes for directory separators.\r
 #     For a directory that has spaces, enclose it in quotes.\r
-EXTRAINCDIRS = ../../\r
+EXTRAINCDIRS = $(LUFA_PATH)/\r
 \r
 \r
 # Compiler flag to set the C Standard level.\r
@@ -159,16 +182,9 @@ EXTRAINCDIRS = ../../
 CSTANDARD = -std=gnu99\r
 \r
 \r
-# Starting byte address of the bootloader\r
-BOOT_START = 0x1E000\r
-\r
-\r
 # Place -D or -U options here for C sources\r
-CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)\r
-CDEFS += -DUSB_DEVICE_ONLY -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DFEATURELESS_CONTROL_ONLY_DEVICE\r
-CDEFS += -DSTATIC_ENDPOINT_CONFIGURATION -DFIXED_CONTROL_ENDPOINT_SIZE=32\r
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
-CDEFS += -DUSE_RAM_DESCRIPTORS -DBOOT_START_ADDR=$(BOOT_START)UL -DUSE_SINGLE_DEVICE_CONFIGURATION\r
+CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
+CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL\r
 \r
 \r
 # Place -D or -U options here for ASM sources\r
@@ -199,10 +215,6 @@ CFLAGS += -fdata-sections
 CFLAGS += -fpack-struct\r
 CFLAGS += -fshort-enums\r
 CFLAGS += -fno-inline-small-functions\r
-CFLAGS += -fno-reorder-blocks\r
-CFLAGS += -fno-reorder-blocks-and-partition\r
-CFLAGS += -fno-reorder-functions\r
-CFLAGS += -fno-toplevel-reorder\r
 CFLAGS += -Wall\r
 CFLAGS += -Wstrict-prototypes\r
 CFLAGS += -Wundef\r
@@ -493,7 +505,7 @@ sizeafter:
 checkhooks: build\r
        @echo\r
        @echo ------- Unhooked LUFA Events -------\r
-       @$(shell) (grep -s '^Event.*LUFA/.*\\.o' $(TARGET).map | \\r
+       @$(shell) (grep -s '^EVENT_.*LUFA/.*\\.o' $(TARGET).map | \\r
                   cut -d' ' -f1 | cut -d'_' -f2- | grep ".*") || \\r
                           echo "(None)"\r
        @echo ------------------------------------\r