Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
d37900b906
|
@ -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
|
||||
|
|
|
@ -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
|
||||
#
|
||||
|
|
|
@ -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
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue