diff options
| author | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
|---|---|---|
| committer | lokher <lokher@gmail.com> | 2022-09-13 11:13:00 +0800 |
| commit | fe13cedf8c09fa34d5cec4e4c624738095176625 (patch) | |
| tree | 818436626d49c7f22f325632b2053edba10d4358 /builddefs/bootloader.mk | |
| parent | fa207545a9759c50b9f230eb608d86a9085801d4 (diff) | |
| parent | f46379f308783994b8178f95adc686f4b4c3ebd8 (diff) | |
merge upstream master
Diffstat (limited to 'builddefs/bootloader.mk')
| -rw-r--r-- | builddefs/bootloader.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk index eba8e280e4..9f55536423 100644 --- a/builddefs/bootloader.mk +++ b/builddefs/bootloader.mk @@ -105,8 +105,8 @@ ifeq ($(strip $(BOOTLOADER)), halfkay) ifeq ($(strip $(MCU)), at90usb1286) BOOTLOADER_SIZE = 1024 endif - # Teensy LC, 3.x - ifneq (,$(filter $(MCU_ORIG), MKL26Z64 MK20DX128 MK20DX256 MK66FX1M0)) + # Teensy LC, 3.0, 3.1/2, 3.5, 3.6 + ifneq (,$(filter $(MCU_ORIG), MKL26Z64 MK20DX128 MK20DX256 MK64FX512 MK66FX1M0)) FIRMWARE_FORMAT = hex endif endif @@ -199,6 +199,11 @@ endif ifeq ($(strip $(BOOTLOADER)), tinyuf2) OPT_DEFS += -DBOOTLOADER_TINYUF2 BOOTLOADER_TYPE = tinyuf2 + FIRMWARE_FORMAT = uf2 +endif +ifeq ($(strip $(BOOTLOADER)), rp2040) + OPT_DEFS += -DBOOTLOADER_RP2040 + BOOTLOADER_TYPE = rp2040 endif ifeq ($(strip $(BOOTLOADER)), halfkay) OPT_DEFS += -DBOOTLOADER_HALFKAY |