diff options
| author | QMK Bot <hello@qmk.fm> | 2022-05-06 12:18:51 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-05-06 12:18:51 +0000 |
| commit | 84ffd4f72deffb2a8a795de475c597b27b9ace8c (patch) | |
| tree | 8810c1cddfdc501825399b52373acccd23903df5 | |
| parent | 7598f1f3af69c1a0fae58888da55018252502dc0 (diff) | |
| parent | 8c23f87c5147f2a25784bc4501b40a5f7150b1f1 (diff) | |
| download | qmk_firmware-84ffd4f72deffb2a8a795de475c597b27b9ace8c.tar.gz qmk_firmware-84ffd4f72deffb2a8a795de475c597b27b9ace8c.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | builddefs/bootloader.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk index f0a6c084a2..eba8e280e4 100644 --- a/builddefs/bootloader.mk +++ b/builddefs/bootloader.mk @@ -97,12 +97,18 @@ ifeq ($(strip $(BOOTLOADER)), halfkay) OPT_DEFS += -DBOOTLOADER_HALFKAY BOOTLOADER_TYPE = halfkay + # Teensy 2.0 ifeq ($(strip $(MCU)), atmega32u4) BOOTLOADER_SIZE = 512 endif + # Teensy 2.0++ ifeq ($(strip $(MCU)), at90usb1286) BOOTLOADER_SIZE = 1024 endif + # Teensy LC, 3.x + ifneq (,$(filter $(MCU_ORIG), MKL26Z64 MK20DX128 MK20DX256 MK66FX1M0)) + FIRMWARE_FORMAT = hex + endif endif ifeq ($(strip $(BOOTLOADER)), caterina) OPT_DEFS += -DBOOTLOADER_CATERINA |