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 871a92d..def34aa 100644 (file)
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -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
@@ -110,6 +114,17 @@ OBJDIR = .
 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
@@ -167,16 +182,9 @@ EXTRAINCDIRS = $(LUFA_PATH)/
 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 -DCONTROL_ONLY_DEVICE\r
-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=32 -DUSE_SINGLE_DEVICE_CONFIGURATION\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\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