diff options
| author | fauxpark <fauxpark@gmail.com> | 2019-12-30 07:53:23 +1100 |
|---|---|---|
| committer | Joel Challis <git@zvecr.com> | 2019-12-29 20:53:23 +0000 |
| commit | 559ef215638e82de75e3e9221baf4909990f4f53 (patch) | |
| tree | 362015e6df40e9850056739ce77cb89f196804c0 | |
| parent | 64263bbb0255df756dc30467ee6643054d325597 (diff) | |
| download | qmk_firmware-559ef215638e82de75e3e9221baf4909990f4f53.tar.gz qmk_firmware-559ef215638e82de75e3e9221baf4909990f4f53.zip | |
Add LUFA mass storage `BOOTLOADER` "support" (#7729)
| -rw-r--r-- | bootloader.mk | 7 | ||||
| -rw-r--r-- | keyboards/gray_studio/cod67/rules.mk | 5 | ||||
| -rwxr-xr-x | keyboards/tada68/rules.mk | 5 |
3 files changed, 9 insertions, 8 deletions
diff --git a/bootloader.mk b/bootloader.mk index d61553394..e516e9ff9 100644 --- a/bootloader.mk +++ b/bootloader.mk | |||
| @@ -82,6 +82,13 @@ ifeq ($(strip $(BOOTLOADER)), USBasp) | |||
| 82 | OPT_DEFS += -DBOOTLOADER_USBASP | 82 | OPT_DEFS += -DBOOTLOADER_USBASP |
| 83 | BOOTLOADER_SIZE = 4096 | 83 | BOOTLOADER_SIZE = 4096 |
| 84 | endif | 84 | endif |
| 85 | ifeq ($(strip $(BOOTLOADER)), lufa-ms) | ||
| 86 | # DO NOT USE THIS BOOTLOADER IN NEW PROJECTS! | ||
| 87 | # It is extremely prone to bricking, and is only included to support existing boards. | ||
| 88 | OPT_DEFS += -DBOOTLOADER_MS | ||
| 89 | BOOTLOADER_SIZE = 6144 | ||
| 90 | FIRMWARE_FORMAT = bin | ||
| 91 | endif | ||
| 85 | 92 | ||
| 86 | ifdef BOOTLOADER_SIZE | 93 | ifdef BOOTLOADER_SIZE |
| 87 | OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE)) | 94 | OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE)) |
diff --git a/keyboards/gray_studio/cod67/rules.mk b/keyboards/gray_studio/cod67/rules.mk index 0bed09539..132db98f4 100644 --- a/keyboards/gray_studio/cod67/rules.mk +++ b/keyboards/gray_studio/cod67/rules.mk | |||
| @@ -9,10 +9,7 @@ MCU = atmega32u4 | |||
| 9 | # QMK DFU qmk-dfu | 9 | # QMK DFU qmk-dfu |
| 10 | # ATmega32A bootloadHID | 10 | # ATmega32A bootloadHID |
| 11 | # ATmega328P USBasp | 11 | # ATmega328P USBasp |
| 12 | BOOTLOADER = atmel-dfu # actually lufa-ms | 12 | BOOTLOADER = lufa-ms |
| 13 | |||
| 14 | # Mass storage bootloader on the COD67 uses bin files | ||
| 15 | FIRMWARE_FORMAT = bin | ||
| 16 | 13 | ||
| 17 | # Build Options | 14 | # Build Options |
| 18 | # change yes to no to disable | 15 | # change yes to no to disable |
diff --git a/keyboards/tada68/rules.mk b/keyboards/tada68/rules.mk index ec3991c31..38b05e042 100755 --- a/keyboards/tada68/rules.mk +++ b/keyboards/tada68/rules.mk | |||
| @@ -9,10 +9,7 @@ MCU = atmega32u4 | |||
| 9 | # QMK DFU qmk-dfu | 9 | # QMK DFU qmk-dfu |
| 10 | # ATmega32A bootloadHID | 10 | # ATmega32A bootloadHID |
| 11 | # ATmega328P USBasp | 11 | # ATmega328P USBasp |
| 12 | BOOTLOADER = atmel-dfu # actually lufa-ms | 12 | BOOTLOADER = lufa-ms |
| 13 | |||
| 14 | # Mass storage bootloader on the tada68 uses bin files | ||
| 15 | FIRMWARE_FORMAT = bin | ||
| 16 | 13 | ||
| 17 | # Build Options | 14 | # Build Options |
| 18 | # comment out to disable the options. | 15 | # comment out to disable the options. |
