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) | |
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 2bcca6bb81..5ba118fb44 100644 --- a/bootloader.mk +++ b/bootloader.mk @@ -52,26 +52,26 @@ ifeq ($(strip $(BOOTLOADER)), lufa-dfu) OPT_DEFS += -DBOOTLOADER_LUFA_DFU OPT_DEFS += -DBOOTLOADER_DFU ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647)) - BOOTLOADER_SIZE = 4096 + BOOTLOADER_SIZE ?= 4096 endif ifneq (,$(filter $(MCU), at90usb1286 at90usb1287)) - BOOTLOADER_SIZE = 8192 + BOOTLOADER_SIZE ?= 8192 endif endif ifeq ($(strip $(BOOTLOADER)), qmk-dfu) OPT_DEFS += -DBOOTLOADER_QMK_DFU OPT_DEFS += -DBOOTLOADER_DFU ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647)) - BOOTLOADER_SIZE = 4096 + BOOTLOADER_SIZE ?= 4096 endif ifneq (,$(filter $(MCU), at90usb1286 at90usb1287)) - BOOTLOADER_SIZE = 8192 + BOOTLOADER_SIZE ?= 8192 endif endif ifeq ($(strip $(BOOTLOADER)), qmk-hid) OPT_DEFS += -DBOOTLOADER_QMK_HID OPT_DEFS += -DBOOTLOADER_HID - BOOTLOADER_SIZE = 4096 + BOOTLOADER_SIZE ?= 4096 endif ifeq ($(strip $(BOOTLOADER)), halfkay) OPT_DEFS += -DBOOTLOADER_HALFKAY |