~ruther/qmk_firmware

84ffd4f72deffb2a8a795de475c597b27b9ace8c — QMK Bot 3 years ago 7598f1f + 8c23f87
Merge remote-tracking branch 'origin/master' into develop
1 files changed, 6 insertions(+), 0 deletions(-)

M builddefs/bootloader.mk
M builddefs/bootloader.mk => builddefs/bootloader.mk +6 -0
@@ 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