diff options
author | Drashna Jaelre <drashna@live.com> | 2019-07-16 01:28:23 -0700 |
---|---|---|
committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-07-16 01:28:23 -0700 |
commit | f859375284f5a27f5b4f8cbe654e305ca3face17 (patch) | |
tree | d96817bb77d0d940a565662a6a832c3d4495969e /lib/lufa | |
parent | f6651424a022d6209c39981f0cf45fd87660578c (diff) | |
download | qmk_firmware-f859375284f5a27f5b4f8cbe654e305ca3face17.tar.gz qmk_firmware-f859375284f5a27f5b4f8cbe654e305ca3face17.zip |
Expand bootloader target to support most AVR boards (#6255)
* Update the :bootloader target to pass along correct hardware info
* Update make scripts to properly grab the settings (a big thanks to @yanfali)
* Remove LUFA debug warnings
Diffstat (limited to 'lib/lufa')
-rw-r--r-- | lib/lufa/Bootloaders/DFU/makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/lufa/Bootloaders/DFU/makefile b/lib/lufa/Bootloaders/DFU/makefile index 0d2014015..a10a57637 100644 --- a/lib/lufa/Bootloaders/DFU/makefile +++ b/lib/lufa/Bootloaders/DFU/makefile | |||
@@ -11,11 +11,11 @@ | |||
11 | 11 | ||
12 | # Run "make help" for target help. | 12 | # Run "make help" for target help. |
13 | 13 | ||
14 | MCU = atmega32u4 | 14 | MCU ?= atmega32u4 |
15 | ARCH = AVR8 | 15 | ARCH ?= AVR8 |
16 | BOARD = QMK | 16 | BOARD ?= QMK |
17 | F_CPU = 16000000 | 17 | F_CPU ?= 16000000 |
18 | F_USB = $(F_CPU) | 18 | F_USB ?= $(F_CPU) |
19 | OPTIMIZATION = s | 19 | OPTIMIZATION = s |
20 | TARGET = BootloaderDFU | 20 | TARGET = BootloaderDFU |
21 | SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB) | 21 | SRC = $(TARGET).c Descriptors.c BootloaderAPI.c BootloaderAPITable.S $(LUFA_SRC_USB) |
@@ -26,8 +26,8 @@ LD_FLAGS = -Wl,--section-start=.text=$(BOOT_START_OFFSET) $(BOOT_API_LD_FLAG | |||
26 | # Flash size and bootloader section sizes of the target, in KB. These must | 26 | # Flash size and bootloader section sizes of the target, in KB. These must |
27 | # match the target's total FLASH size and the bootloader size set in the | 27 | # match the target's total FLASH size and the bootloader size set in the |
28 | # device's fuses. | 28 | # device's fuses. |
29 | FLASH_SIZE_KB = 32 | 29 | FLASH_SIZE_KB ?= 32 |
30 | BOOT_SECTION_SIZE_KB = 4 | 30 | BOOT_SECTION_SIZE_KB ?= 4 |
31 | 31 | ||
32 | # Bootloader address calculation formulas | 32 | # Bootloader address calculation formulas |
33 | # Do not modify these macros, but rather modify the dependent values above. | 33 | # Do not modify these macros, but rather modify the dependent values above. |