gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-30 06:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot 2021-06-16 04:28:45 +00:00
commit d37900b906
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootloader.mk
View File

@ -90,7 +90,7 @@ ifeq ($(strip $(BOOTLOADER)), USBasp)
endif endif
ifeq ($(strip $(BOOTLOADER)), lufa-ms) ifeq ($(strip $(BOOTLOADER)), lufa-ms)
OPT_DEFS += -DBOOTLOADER_MS OPT_DEFS += -DBOOTLOADER_MS
BOOTLOADER_SIZE = 6144 BOOTLOADER_SIZE ?= 8192
FIRMWARE_FORMAT = bin FIRMWARE_FORMAT = bin
cpfirmware: lufa_warning cpfirmware: lufa_warning
.INTERMEDIATE: lufa_warning .INTERMEDIATE: lufa_warning

3
keyboards/gray_studio/cod67/rules.mk
View File

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

3
keyboards/tada68/rules.mk
View File

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