Merge remote-tracking branch 'origin/master' into develop

2021-06-16 04:28:45 +00:00 · 2021-06-16 04:28:45 +00:00 · d37900b906
commit d37900b906
parent 06971da0be 4720aa4a34
3 changed files with 7 additions and 1 deletions
--- a/bootloader.mk
+++ b/bootloader.mk
@ -90,7 +90,7 @@ ifeq ($(strip $(BOOTLOADER)), USBasp)
 endif
 ifeq ($(strip $(BOOTLOADER)), lufa-ms)
    OPT_DEFS += -DBOOTLOADER_MS
-    BOOTLOADER_SIZE = 6144
+    BOOTLOADER_SIZE ?= 8192
    FIRMWARE_FORMAT = bin
 cpfirmware: lufa_warning
 .INTERMEDIATE: lufa_warning
--- a/keyboards/gray_studio/cod67/rules.mk
+++ b/keyboards/gray_studio/cod67/rules.mk
@ -11,6 +11,9 @@ MCU = atmega32u4
 #   ATmega328P   USBasp
 BOOTLOADER = lufa-ms

+# This board uses the older unsafe 6k version of lufa-ms
+BOOTLOADER_SIZE = 6144
+
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/tada68/rules.mk
+++ b/keyboards/tada68/rules.mk
@ -11,6 +11,9 @@ MCU = atmega32u4
 #   ATmega328P   USBasp
 BOOTLOADER = lufa-ms

+# This board uses the older unsafe 6k version of lufa-ms
+BOOTLOADER_SIZE = 6144
+
 # Build Options
 #   change yes to no to disable
 #