X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/40db485c7967c584eb9fe855e744ed0dc6fe8bae..e4f3d9957efee6d2259f3b9f19a26ce0c8bee95d:/Bootloaders/CDC/makefile

diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index c23782a83..8fa7cb229 100644
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -86,11 +86,13 @@ F_CLOCK = $(F_CPU)
 
 
 # Starting byte address of the bootloader, as a byte address - computed via the formula
-#   BOOT_START = ((TOTAL_FLASH_BYTES - BOOTLOADER_SECTION_SIZE_BYTES) * 1024)
+#   BOOT_START = ((FLASH_SIZE_KB - BOOT_SECTION_SIZE_KB) * 1024)
 #
 # Note that the bootloader size and start address given in AVRStudio is in words and not
 # bytes, and so will need to be doubled to obtain the byte address needed by AVR-GCC.
-BOOT_START = 0x1E000
+FLASH_SIZE_KB        = 128
+BOOT_SECTION_SIZE_KB = 4
+BOOT_START           = 0x$(shell echo "obase=16; ($(FLASH_SIZE_KB) - $(BOOT_SECTION_SIZE_KB)) * 1024" | bc)
 
 
 # Output format. (can be srec, ihex, binary)
@@ -114,6 +116,7 @@ LUFA_PATH = ../..
 # LUFA library compile-time options and predefined tokens
 LUFA_OPTS  = -D USB_DEVICE_ONLY
 LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
+LUFA_OPTS += -D ORDERED_EP_CONFIG
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS
@@ -121,7 +124,6 @@ LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENAB
 LUFA_OPTS += -D NO_INTERNAL_SERIAL
 LUFA_OPTS += -D NO_DEVICE_SELF_POWER
 LUFA_OPTS += -D NO_DEVICE_REMOTE_WAKEUP
-LUFA_OPTS += -D NO_STREAM_CALLBACKS
 LUFA_OPTS += -D NO_SOF_EVENTS
 
 #LUFA_OPTS += -D NO_BLOCK_SUPPORT
@@ -194,14 +196,15 @@ CDEFS += $(LUFA_OPTS)
 ADEFS  = -DF_CPU=$(F_CPU)
 ADEFS += -DF_CLOCK=$(F_CLOCK)UL
 ADEFS += -DBOARD=BOARD_$(BOARD)
-CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
+ADEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
 ADEFS += $(LUFA_OPTS)
 
+
 # Place -D or -U options here for C++ sources
 CPPDEFS  = -DF_CPU=$(F_CPU)UL
 CPPDEFS += -DF_CLOCK=$(F_CLOCK)UL
 CPPDEFS += -DBOARD=BOARD_$(BOARD)
-CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
+CPPDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
 CPPDEFS += $(LUFA_OPTS)
 #CPPDEFS += -D__STDC_LIMIT_MACROS
 #CPPDEFS += -D__STDC_CONSTANT_MACROS