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 f3d5cfa..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
 #\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
 \r
 \r
 # Output format. (can be srec, ihex, binary)\r


@@ -115,9 +119,10 @@ LUFA_OPTS  = -D USB_DEVICE_ONLY
 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 USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r

 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\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
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r


@@ -177,10 +182,6 @@ EXTRAINCDIRS = $(LUFA_PATH)/
 CSTANDARD = -std=gnu99\r
 \r
 \r
 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) $(LUFA_OPTS)\r
 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL\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) $(LUFA_OPTS)\r
 CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL\r