mirror of
https://github.com/firewalkwithm3/qmk_firmware.git
synced 2024-11-22 19:40:29 +08:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
cfc7ee61c5
|
@ -92,10 +92,14 @@ ifeq ($(strip $(BOOTLOADER)), lufa-ms)
|
||||||
OPT_DEFS += -DBOOTLOADER_MS
|
OPT_DEFS += -DBOOTLOADER_MS
|
||||||
BOOTLOADER_SIZE = 6144
|
BOOTLOADER_SIZE = 6144
|
||||||
FIRMWARE_FORMAT = bin
|
FIRMWARE_FORMAT = bin
|
||||||
$(info LUFA MASS STORAGE Bootloader selected)
|
cpfirmware: lufa_warning
|
||||||
$(info DO NOT USE THIS BOOTLOADER IN NEW PROJECTS!)
|
.INTERMEDIATE: lufa_warning
|
||||||
$(info It is extremely prone to bricking, and is only included to support existing boards.)
|
lufa_warning: $(FIRMWARE_FORMAT)
|
||||||
$(info )
|
$(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@)
|
||||||
|
$(info LUFA MASS STORAGE Bootloader selected)
|
||||||
|
$(info DO NOT USE THIS BOOTLOADER IN NEW PROJECTS!)
|
||||||
|
$(info It is extremely prone to bricking, and is only included to support existing boards.)
|
||||||
|
$(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@)
|
||||||
endif
|
endif
|
||||||
ifdef BOOTLOADER_SIZE
|
ifdef BOOTLOADER_SIZE
|
||||||
OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE))
|
OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE))
|
||||||
|
|
Loading…
Reference in a new issue