diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2018-05-08 15:24:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-08 15:24:18 -0400 |
| commit | 14b7602a65dedaf51db1c9288144765d43a83a15 (patch) | |
| tree | 8e21e6b77db1581deaeecfa3373fe70470e64c1f /bootloader.mk | |
| parent | 46dca121fd2f51c4f5b87e48af37f43340591433 (diff) | |
| download | qmk_firmware-14b7602a65dedaf51db1c9288144765d43a83a15.tar.gz qmk_firmware-14b7602a65dedaf51db1c9288144765d43a83a15.zip | |
Adds IS31FL3731 RGB Matrix Implementation (#2910)
* adds is31fl3731 rgb matrix implementation
* fix build script for force pushes
* allow bootloader size to be overwritten
* adds planck light implementation
* split led config into 2 arrays
* idk
* betterize register handling
* update planck implementation
* update planck
* refine rgb interface
* cleanup names, rgb matrix
* start documentation
* finish up docs
* add effects list
* clean-up merge
* add RGB_MATRIX_SKIP_FRAMES
* add support for at90usb1286 to bootloader options
Diffstat (limited to 'bootloader.mk')
| -rw-r--r-- | bootloader.mk | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/bootloader.mk b/bootloader.mk index 55352f3d4..f30e38dd0 100644 --- a/bootloader.mk +++ b/bootloader.mk | |||
| @@ -32,17 +32,32 @@ | |||
| 32 | ifeq ($(strip $(BOOTLOADER)), atmel-dfu) | 32 | ifeq ($(strip $(BOOTLOADER)), atmel-dfu) |
| 33 | OPT_DEFS += -DBOOTLOADER_ATMEL_DFU | 33 | OPT_DEFS += -DBOOTLOADER_ATMEL_DFU |
| 34 | OPT_DEFS += -DBOOTLOADER_DFU | 34 | OPT_DEFS += -DBOOTLOADER_DFU |
| 35 | BOOTLOADER_SIZE = 4096 | 35 | ifeq ($(strip $(MCU)), atmega32u4) |
| 36 | BOOTLOADER_SIZE = 4096 | ||
| 37 | endif | ||
| 38 | ifeq ($(strip $(MCU)), at90usb1286) | ||
| 39 | BOOTLOADER_SIZE = 8192 | ||
| 40 | endif | ||
| 36 | endif | 41 | endif |
| 37 | ifeq ($(strip $(BOOTLOADER)), lufa-dfu) | 42 | ifeq ($(strip $(BOOTLOADER)), lufa-dfu) |
| 38 | OPT_DEFS += -DBOOTLOADER_LUFA_DFU | 43 | OPT_DEFS += -DBOOTLOADER_LUFA_DFU |
| 39 | OPT_DEFS += -DBOOTLOADER_DFU | 44 | OPT_DEFS += -DBOOTLOADER_DFU |
| 40 | BOOTLOADER_SIZE = 4096 | 45 | ifeq ($(strip $(MCU)), atmega32u4) |
| 46 | BOOTLOADER_SIZE = 4096 | ||
| 47 | endif | ||
| 48 | ifeq ($(strip $(MCU)), at90usb1286) | ||
| 49 | BOOTLOADER_SIZE = 8192 | ||
| 50 | endif | ||
| 41 | endif | 51 | endif |
| 42 | ifeq ($(strip $(BOOTLOADER)), qmk-dfu) | 52 | ifeq ($(strip $(BOOTLOADER)), qmk-dfu) |
| 43 | OPT_DEFS += -DBOOTLOADER_QMK_DFU | 53 | OPT_DEFS += -DBOOTLOADER_QMK_DFU |
| 44 | OPT_DEFS += -DBOOTLOADER_DFU | 54 | OPT_DEFS += -DBOOTLOADER_DFU |
| 45 | BOOTLOADER_SIZE = 4096 | 55 | ifeq ($(strip $(MCU)), atmega32u4) |
| 56 | BOOTLOADER_SIZE = 4096 | ||
| 57 | endif | ||
| 58 | ifeq ($(strip $(MCU)), at90usb1286) | ||
| 59 | BOOTLOADER_SIZE = 8192 | ||
| 60 | endif | ||
| 46 | endif | 61 | endif |
| 47 | ifeq ($(strip $(BOOTLOADER)), halfkay) | 62 | ifeq ($(strip $(BOOTLOADER)), halfkay) |
| 48 | OPT_DEFS += -DBOOTLOADER_HALFKAY | 63 | OPT_DEFS += -DBOOTLOADER_HALFKAY |
| @@ -59,4 +74,4 @@ endif | |||
| 59 | 74 | ||
| 60 | ifdef BOOTLOADER_SIZE | 75 | ifdef BOOTLOADER_SIZE |
| 61 | OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE)) | 76 | OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE)) |
| 62 | endif \ No newline at end of file | 77 | endif |
