From 54503168c93b6322975e3144c929cffe6c74d36c Mon Sep 17 00:00:00 2001
From: fauxpark <fauxpark@gmail.com>
Date: Wed, 18 Sep 2019 09:48:58 +1000
Subject: [PATCH] Update bootloader.mk (#6698)
---
bootloader.mk | 36 +++++++++++++++++++-----------------
1 file 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)