Update bootloader.mk (qmk#6698)

sekigon-gonnoc · Sep 17, 2019 · 5450316 · 5450316
1 parent 23186d3
commit 5450316
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/bootloader.mk b/bootloader.mk
@@ -19,53 +19,55 @@
 #
 # 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
 
 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)