diff options
| author | QMK Bot <hello@qmk.fm> | 2021-06-10 06:06:03 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-06-10 06:06:03 +0000 |
| commit | cfc7ee61c5cb9822a1195028681b928bbeac2fd3 (patch) | |
| tree | 0b1e210330b105550eb71e2342569c5b9d29424f | |
| parent | 7a6e630ffd1a2a8357daf8b7ed2ab766eae55e07 (diff) | |
| parent | d684b8cafed8298bed53c6fb184086fc573f4e91 (diff) | |
| download | qmk_firmware-cfc7ee61c5cb9822a1195028681b928bbeac2fd3.tar.gz qmk_firmware-cfc7ee61c5cb9822a1195028681b928bbeac2fd3.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | bootloader.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/bootloader.mk b/bootloader.mk index d130dbbcc..79d3c3d72 100644 --- a/bootloader.mk +++ b/bootloader.mk | |||
| @@ -92,10 +92,14 @@ ifeq ($(strip $(BOOTLOADER)), lufa-ms) | |||
| 92 | OPT_DEFS += -DBOOTLOADER_MS | 92 | OPT_DEFS += -DBOOTLOADER_MS |
| 93 | BOOTLOADER_SIZE = 6144 | 93 | BOOTLOADER_SIZE = 6144 |
| 94 | FIRMWARE_FORMAT = bin | 94 | FIRMWARE_FORMAT = bin |
| 95 | $(info LUFA MASS STORAGE Bootloader selected) | 95 | cpfirmware: lufa_warning |
| 96 | $(info DO NOT USE THIS BOOTLOADER IN NEW PROJECTS!) | 96 | .INTERMEDIATE: lufa_warning |
| 97 | $(info It is extremely prone to bricking, and is only included to support existing boards.) | 97 | lufa_warning: $(FIRMWARE_FORMAT) |
| 98 | $(info ) | 98 | $(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@) |
| 99 | $(info LUFA MASS STORAGE Bootloader selected) | ||
| 100 | $(info DO NOT USE THIS BOOTLOADER IN NEW PROJECTS!) | ||
| 101 | $(info It is extremely prone to bricking, and is only included to support existing boards.) | ||
| 102 | $(info @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@) | ||
| 99 | endif | 103 | endif |
| 100 | ifdef BOOTLOADER_SIZE | 104 | ifdef BOOTLOADER_SIZE |
| 101 | OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE)) | 105 | OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE)) |