diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-19 04:34:35 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-19 04:34:35 +0000 |
| commit | beb0b2bda0c45e958e88933a055d409e42fa0a0b (patch) | |
| tree | 2a8db61b0ccdee8fcfb3d1ef551bf76049fb28bf /Bootloaders | |
| parent | dfa547164a1f9aefe202041e61075852f6e47191 (diff) | |
| download | lufa-beb0b2bda0c45e958e88933a055d409e42fa0a0b.tar.gz lufa-beb0b2bda0c45e958e88933a055d409e42fa0a0b.tar.bz2 lufa-beb0b2bda0c45e958e88933a055d409e42fa0a0b.zip | |
Move LUFA compile time options to a new section in the application makefiles for clarity.
Diffstat (limited to 'Bootloaders')
| -rw-r--r-- | Bootloaders/CDC/makefile | 16 | ||||
| -rw-r--r-- | Bootloaders/DFU/makefile | 17 | ||||
| -rw-r--r-- | Bootloaders/TeensyHID/makefile | 17 |
3 files changed, 35 insertions, 15 deletions
diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile index 8425e9b31..71e2da7f6 100644 --- a/Bootloaders/CDC/makefile +++ b/Bootloaders/CDC/makefile @@ -110,6 +110,15 @@ OBJDIR = . LUFA_PATH = ../..
+# LUFA library compile-time options
+LUFA_OPTS = USB_DEVICE_ONLY
+LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION
+LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += USE_RAM_DESCRIPTORS
+
+
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
Descriptors.c \
@@ -172,11 +181,8 @@ 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)
-CDEFS += -DUSB_DEVICE_ONLY -DUSE_NONSTANDARD_DESCRIPTOR_NAMES
-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
-CDEFS += -DUSE_RAM_DESCRIPTORS -DBOOT_START_ADDR=$(BOOT_START)UL
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
+CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
# Place -D or -U options here for ASM sources
diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index 871a92da2..410301431 100644 --- a/Bootloaders/DFU/makefile +++ b/Bootloaders/DFU/makefile @@ -110,6 +110,16 @@ OBJDIR = . LUFA_PATH = ../..
+# LUFA library compile-time options
+LUFA_OPTS = USB_DEVICE_ONLY
+LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += CONTROL_ONLY_DEVICE
+LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=32
+LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION
+LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += USE_RAM_DESCRIPTORS
+
+
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
Descriptors.c \
@@ -172,11 +182,8 @@ 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)
-CDEFS += -DUSB_DEVICE_ONLY -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DCONTROL_ONLY_DEVICE
-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=32 -DUSE_SINGLE_DEVICE_CONFIGURATION
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
-CDEFS += -DUSE_RAM_DESCRIPTORS -DBOOT_START_ADDR=$(BOOT_START)UL
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
+CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
# Place -D or -U options here for ASM sources
diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile index fb3f1eb28..f4b884308 100644 --- a/Bootloaders/TeensyHID/makefile +++ b/Bootloaders/TeensyHID/makefile @@ -110,6 +110,16 @@ OBJDIR = . LUFA_PATH = ../..
+# LUFA library compile-time options
+LUFA_OPTS = USB_DEVICE_ONLY
+LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES
+LUFA_OPTS += CONTROL_ONLY_DEVICE
+LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8
+LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION
+LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
+LUFA_OPTS += USE_RAM_DESCRIPTORS
+
+
# List C source files here. (C dependencies are automatically generated.)
SRC = $(TARGET).c \
Descriptors.c \
@@ -172,11 +182,8 @@ BOOT_START = 0xC000 # Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD)
-CDEFS += -DUSB_DEVICE_ONLY -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DCONTROL_ONLY_DEVICE
-CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION
-CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"
-CDEFS += -DUSE_RAM_DESCRIPTORS -DBOOT_START_ADDR=$(BOOT_START)UL
+CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS))
+CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL
# Place -D or -U options here for ASM sources
|