diff options
| author | QMK Bot <hello@qmk.fm> | 2021-06-16 04:28:45 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-06-16 04:28:45 +0000 |
| commit | d37900b906227a312dd9fa7990567f4f3f203230 (patch) | |
| tree | 8597aa2923769196a64512fb78918778be4c423b | |
| parent | 06971da0be4db1a1acd9e37e3d66431a21f22e45 (diff) | |
| parent | 4720aa4a34d553ce1ab64b686f851be35534468d (diff) | |
| download | qmk_firmware-d37900b906227a312dd9fa7990567f4f3f203230.tar.gz qmk_firmware-d37900b906227a312dd9fa7990567f4f3f203230.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | bootloader.mk | 2 | ||||
| -rw-r--r-- | keyboards/gray_studio/cod67/rules.mk | 3 | ||||
| -rwxr-xr-x | keyboards/tada68/rules.mk | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/bootloader.mk b/bootloader.mk index 79d3c3d72a..4f2d69d998 100644 --- 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 diff --git a/keyboards/gray_studio/cod67/rules.mk b/keyboards/gray_studio/cod67/rules.mk index 129bd624cc..2e066d9915 100644 --- 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 # diff --git a/keyboards/tada68/rules.mk b/keyboards/tada68/rules.mk index a7c3cf1e35..47fdba5554 100755 --- 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 # |