X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7d391eb04c116b8a79c1a99df3708a0b2200fab0..2a0c28e6e47c8a173f32fc99cd8666a2633c5c12:/Bootloaders/DFU/makefile

diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index 06551d561..def34aa96 100644
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -89,7 +89,11 @@ F_CPU = 8000000
 #
 #     If no clock division is performed on the input clock inside the AVR (via the
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_CLOCK = 8000000
+F_CLOCK = $(F_CPU)
+
+
+# Starting byte address of the bootloader
+BOOT_START = 0x1E000
 
 
 # Output format. (can be srec, ihex, binary)
@@ -115,9 +119,9 @@ LUFA_OPTS  = -D USB_DEVICE_ONLY
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES
 LUFA_OPTS += -D CONTROL_ONLY_DEVICE
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32
-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS
+LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
 LUFA_OPTS += -D NO_INTERNAL_SERIAL
 
 
@@ -178,10 +182,6 @@ EXTRAINCDIRS = $(LUFA_PATH)/
 CSTANDARD = -std=gnu99
 
 
-# Starting byte address of the bootloader
-BOOT_START = 0x1E000
-
-
 # Place -D or -U options here for C sources
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL