diff options
| author | QMK Bot <hello@qmk.fm> | 2021-10-11 13:31:01 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-10-11 13:31:01 +0000 |
| commit | 0c65562a6b7aeaec2c258b288e6498bd92295b9c (patch) | |
| tree | 15d0f44a42b0bee5be2b746e3674f34a46d79c08 | |
| parent | 087c9f33e9c2de610009e9d7d3c962a2ce8fd035 (diff) | |
| parent | 5640b6cd77392222547f62c0fda1313e5e4a4ed3 (diff) | |
| download | qmk_firmware-0c65562a6b7aeaec2c258b288e6498bd92295b9c.tar.gz qmk_firmware-0c65562a6b7aeaec2c258b288e6498bd92295b9c.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | bootloader.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bootloader.mk b/bootloader.mk index 2bcca6bb8..5ba118fb4 100644 --- a/bootloader.mk +++ b/bootloader.mk | |||
| @@ -52,26 +52,26 @@ ifeq ($(strip $(BOOTLOADER)), lufa-dfu) | |||
| 52 | OPT_DEFS += -DBOOTLOADER_LUFA_DFU | 52 | OPT_DEFS += -DBOOTLOADER_LUFA_DFU |
| 53 | OPT_DEFS += -DBOOTLOADER_DFU | 53 | OPT_DEFS += -DBOOTLOADER_DFU |
| 54 | ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647)) | 54 | ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647)) |
| 55 | BOOTLOADER_SIZE = 4096 | 55 | BOOTLOADER_SIZE ?= 4096 |
| 56 | endif | 56 | endif |
| 57 | ifneq (,$(filter $(MCU), at90usb1286 at90usb1287)) | 57 | ifneq (,$(filter $(MCU), at90usb1286 at90usb1287)) |
| 58 | BOOTLOADER_SIZE = 8192 | 58 | BOOTLOADER_SIZE ?= 8192 |
| 59 | endif | 59 | endif |
| 60 | endif | 60 | endif |
| 61 | ifeq ($(strip $(BOOTLOADER)), qmk-dfu) | 61 | ifeq ($(strip $(BOOTLOADER)), qmk-dfu) |
| 62 | OPT_DEFS += -DBOOTLOADER_QMK_DFU | 62 | OPT_DEFS += -DBOOTLOADER_QMK_DFU |
| 63 | OPT_DEFS += -DBOOTLOADER_DFU | 63 | OPT_DEFS += -DBOOTLOADER_DFU |
| 64 | ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647)) | 64 | ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647)) |
| 65 | BOOTLOADER_SIZE = 4096 | 65 | BOOTLOADER_SIZE ?= 4096 |
| 66 | endif | 66 | endif |
| 67 | ifneq (,$(filter $(MCU), at90usb1286 at90usb1287)) | 67 | ifneq (,$(filter $(MCU), at90usb1286 at90usb1287)) |
| 68 | BOOTLOADER_SIZE = 8192 | 68 | BOOTLOADER_SIZE ?= 8192 |
| 69 | endif | 69 | endif |
| 70 | endif | 70 | endif |
| 71 | ifeq ($(strip $(BOOTLOADER)), qmk-hid) | 71 | ifeq ($(strip $(BOOTLOADER)), qmk-hid) |
| 72 | OPT_DEFS += -DBOOTLOADER_QMK_HID | 72 | OPT_DEFS += -DBOOTLOADER_QMK_HID |
| 73 | OPT_DEFS += -DBOOTLOADER_HID | 73 | OPT_DEFS += -DBOOTLOADER_HID |
| 74 | BOOTLOADER_SIZE = 4096 | 74 | BOOTLOADER_SIZE ?= 4096 |
| 75 | endif | 75 | endif |
| 76 | ifeq ($(strip $(BOOTLOADER)), halfkay) | 76 | ifeq ($(strip $(BOOTLOADER)), halfkay) |
| 77 | OPT_DEFS += -DBOOTLOADER_HALFKAY | 77 | OPT_DEFS += -DBOOTLOADER_HALFKAY |