From 559ef215638e82de75e3e9221baf4909990f4f53 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Mon, 30 Dec 2019 07:53:23 +1100 Subject: [PATCH] Add LUFA mass storage `BOOTLOADER` "support" (#7729) --- bootloader.mk | 7 +++++++ keyboards/gray_studio/cod67/rules.mk | 5 +---- keyboards/tada68/rules.mk | 5 +---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bootloader.mk b/bootloader.mk index d615533947..e516e9ff9f 100644 --- a/bootloader.mk +++ b/bootloader.mk @@ -82,6 +82,13 @@ ifeq ($(strip $(BOOTLOADER)), USBasp) OPT_DEFS += -DBOOTLOADER_USBASP BOOTLOADER_SIZE = 4096 endif +ifeq ($(strip $(BOOTLOADER)), lufa-ms) + # DO NOT USE THIS BOOTLOADER IN NEW PROJECTS! + # It is extremely prone to bricking, and is only included to support existing boards. + OPT_DEFS += -DBOOTLOADER_MS + BOOTLOADER_SIZE = 6144 + FIRMWARE_FORMAT = bin +endif ifdef BOOTLOADER_SIZE OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE)) diff --git a/keyboards/gray_studio/cod67/rules.mk b/keyboards/gray_studio/cod67/rules.mk index 0bed09539f..132db98f45 100644 --- a/keyboards/gray_studio/cod67/rules.mk +++ b/keyboards/gray_studio/cod67/rules.mk @@ -9,10 +9,7 @@ MCU = atmega32u4 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -BOOTLOADER = atmel-dfu # actually lufa-ms - -# Mass storage bootloader on the COD67 uses bin files -FIRMWARE_FORMAT = bin +BOOTLOADER = lufa-ms # Build Options # change yes to no to disable diff --git a/keyboards/tada68/rules.mk b/keyboards/tada68/rules.mk index ec3991c318..38b05e0426 100755 --- a/keyboards/tada68/rules.mk +++ b/keyboards/tada68/rules.mk @@ -9,10 +9,7 @@ MCU = atmega32u4 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -BOOTLOADER = atmel-dfu # actually lufa-ms - -# Mass storage bootloader on the tada68 uses bin files -FIRMWARE_FORMAT = bin +BOOTLOADER = lufa-ms # Build Options # comment out to disable the options.