diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2011-03-21 10:20:42 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-03-21 10:20:42 +0000 |
commit | aba7932a5c7c5f4a65f1c8558c94ed313ff3ca96 (patch) | |
tree | ef58b9575ec89bdd48bc176f0a4d26a20013dbd3 /Bootloaders/CDC | |
parent | c7f4752d6bacf15aaea13a111c1d9bb8576f186d (diff) | |
download | lufa-aba7932a5c7c5f4a65f1c8558c94ed313ff3ca96.tar.gz lufa-aba7932a5c7c5f4a65f1c8558c94ed313ff3ca96.tar.bz2 lufa-aba7932a5c7c5f4a65f1c8558c94ed313ff3ca96.zip |
F_CLOCK changed to F_USB to be more descriptive, and applicable on future architecture ports.
Diffstat (limited to 'Bootloaders/CDC')
-rw-r--r-- | Bootloaders/CDC/makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile index 92b63dad3..cdde8d2b9 100644 --- a/Bootloaders/CDC/makefile +++ b/Bootloaders/CDC/makefile @@ -67,8 +67,8 @@ BOARD = USBKEY # calculate timings. Do NOT tack on a 'UL' at the end, this will be done # automatically to create a 32-bit value in your source code. # -# This will be an integer division of F_CLOCK below, as it is sourced by -# F_CLOCK after it has run through any CPU prescalers. Note that this value +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value # does not *change* the processor frequency - it should merely be updated to # reflect the processor speed set externally so that the code can use accurate # software delays. @@ -76,7 +76,7 @@ F_CPU = 8000000 # Input clock frequency. -# This will define a symbol, F_CLOCK, in all source code files equal to the +# This will define a symbol, F_USB, in all source code files equal to the # input clock frequency (before any prescaling is performed) in Hz. This value may # differ from F_CPU if prescaling is used on the latter, and is required as the # raw input clock is fed directly to the PLL sections of the AVR for high speed @@ -86,7 +86,7 @@ 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 = $(F_CPU) +F_USB = $(F_CPU) # Starting byte address of the bootloader, as a byte address - computed via the formula @@ -190,7 +190,7 @@ CSTANDARD = -std=c99 # Place -D or -U options here for C sources CDEFS = -DF_CPU=$(F_CPU)UL -CDEFS += -DF_CLOCK=$(F_CLOCK)UL +CDEFS += -DF_USB=$(F_USB)UL CDEFS += -DBOARD=BOARD_$(BOARD) -DARCH=ARCH_$(ARCH) CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL CDEFS += $(LUFA_OPTS) @@ -198,7 +198,7 @@ CDEFS += $(LUFA_OPTS) # Place -D or -U options here for ASM sources ADEFS = -DF_CPU=$(F_CPU) -ADEFS += -DF_CLOCK=$(F_CLOCK)UL +ADEFS += -DF_USB=$(F_USB)UL ADEFS += -DBOARD=BOARD_$(BOARD) ADEFS += -DBOOT_START_ADDR=$(BOOT_START)UL ADEFS += $(LUFA_OPTS) @@ -206,7 +206,7 @@ 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 += -DF_USB=$(F_USB)UL CPPDEFS += -DBOARD=BOARD_$(BOARD) CPPDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL CPPDEFS += $(LUFA_OPTS) |