diff options
| author | fauxpark <fauxpark@gmail.com> | 2019-09-18 09:48:58 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 09:48:58 +1000 |
| commit | 54503168c93b6322975e3144c929cffe6c74d36c (patch) | |
| tree | de01119b5cbc95cf4f6c35a797965c93d4ff8983 | |
| parent | 23186d32a36e5ca114e71fc2807c5e4a133edfa7 (diff) | |
| download | qmk_firmware-54503168c93b6322975e3144c929cffe6c74d36c.tar.gz qmk_firmware-54503168c93b6322975e3144c929cffe6c74d36c.zip | |
Update bootloader.mk (#6698)
| -rw-r--r-- | bootloader.mk | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/bootloader.mk b/bootloader.mk index 9d73063d0f..d615533947 100644 --- a/bootloader.mk +++ b/bootloader.mk @@ -19,12 +19,14 @@ # # Sets the bootloader defined in the keyboard's/keymap's rules.mk # Current options: -# atmel-dfu -# lufa-dfu -# qmk-dfu -# halfkay -# caterina -# bootloadHID +# +# halfkay PJRC Teensy +# caterina Pro Micro (Sparkfun/generic) +# atmel-dfu Atmel factory DFU +# lufa-dfu LUFA DFU +# qmk-dfu QMK DFU (LUFA + blinkenlight) +# bootloadHID HIDBootFlash compatible (ATmega32A) +# USBasp USBaspLoader (ATmega328P) # # BOOTLOADER_SIZE can still be defined manually, but it's recommended # you add any possible configuration to this list @@ -32,40 +34,40 @@ ifeq ($(strip $(BOOTLOADER)), atmel-dfu) OPT_DEFS += -DBOOTLOADER_ATMEL_DFU OPT_DEFS += -DBOOTLOADER_DFU - ifeq ($(strip $(MCU)), atmega32u4) - BOOTLOADER_SIZE = 4096 + ifneq (,$(filter $(MCU), at90usb646 atmega16u2 atmega16u4 atmega32u2 atmega32u4)) + BOOTLOADER_SIZE = 4096 endif ifeq ($(strip $(MCU)), at90usb1286) - BOOTLOADER_SIZE = 8192 + BOOTLOADER_SIZE = 8192 endif endif ifeq ($(strip $(BOOTLOADER)), lufa-dfu) OPT_DEFS += -DBOOTLOADER_LUFA_DFU OPT_DEFS += -DBOOTLOADER_DFU - ifeq ($(strip $(MCU)), atmega32u4) - BOOTLOADER_SIZE = 4096 + ifneq (,$(filter $(MCU), at90usb646 atmega16u2 atmega16u4 atmega32u2 atmega32u4)) + BOOTLOADER_SIZE = 4096 endif ifeq ($(strip $(MCU)), at90usb1286) - BOOTLOADER_SIZE = 8192 + BOOTLOADER_SIZE = 8192 endif endif ifeq ($(strip $(BOOTLOADER)), qmk-dfu) OPT_DEFS += -DBOOTLOADER_QMK_DFU OPT_DEFS += -DBOOTLOADER_DFU - ifeq ($(strip $(MCU)), atmega32u4) - BOOTLOADER_SIZE = 4096 + ifneq (,$(filter $(MCU), at90usb646 atmega16u2 atmega16u4 atmega32u2 atmega32u4)) + BOOTLOADER_SIZE = 4096 endif ifeq ($(strip $(MCU)), at90usb1286) - BOOTLOADER_SIZE = 8192 + BOOTLOADER_SIZE = 8192 endif endif ifeq ($(strip $(BOOTLOADER)), halfkay) OPT_DEFS += -DBOOTLOADER_HALFKAY ifeq ($(strip $(MCU)), atmega32u4) - BOOTLOADER_SIZE = 512 + BOOTLOADER_SIZE = 512 endif ifeq ($(strip $(MCU)), at90usb1286) - BOOTLOADER_SIZE = 1024 + BOOTLOADER_SIZE = 1024 endif endif ifeq ($(strip $(BOOTLOADER)), caterina) |