drashna/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated USBasp and bootloadHID bootloader types (#18195)

Browse Source
This commit is contained in:
Ryan 2022-08-29 06:20:43 +10:00 committed by GitHub
parent 8fc62cb098
commit d18698a8e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builddefs/bootloader.mk
View File

@ -116,13 +116,13 @@ ifeq ($(strip $(BOOTLOADER)), caterina)
BOOTLOADER_SIZE = 4096 BOOTLOADER_SIZE = 4096
endif endif
ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID)) ifeq ($(strip $(BOOTLOADER)), bootloadhid)
OPT_DEFS += -DBOOTLOADER_BOOTLOADHID OPT_DEFS += -DBOOTLOADER_BOOTLOADHID
BOOTLOADER_TYPE = bootloadhid BOOTLOADER_TYPE = bootloadhid
BOOTLOADER_SIZE = 4096 BOOTLOADER_SIZE = 4096
endif endif
ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp)) ifeq ($(strip $(BOOTLOADER)), usbasploader)
OPT_DEFS += -DBOOTLOADER_USBASP OPT_DEFS += -DBOOTLOADER_USBASP
BOOTLOADER_TYPE = usbasploader BOOTLOADER_TYPE = usbasploader

2
data/schemas/keyboard.jsonschema
View File

@ -89,7 +89,6 @@
"enum": [ "enum": [
"atmel-dfu", "atmel-dfu",
"bootloadhid", "bootloadhid",
"bootloadHID",
"caterina", "caterina",
"custom", "custom",
"gd32v-dfu", "gd32v-dfu",
@ -106,7 +105,6 @@
"tinyuf2", "tinyuf2",
"unknown", "unknown",
"usbasploader", "usbasploader",
"USBasp",
"wb32-dfu" "wb32-dfu"
] ]
}, },

4
platforms/avr/flash.mk
View File

@ -177,9 +177,9 @@ else ifeq ($(strip $(BOOTLOADER)), halfkay)
$(UNSYNC_OUTPUT_CMD) && $(call EXEC_TEENSY) $(UNSYNC_OUTPUT_CMD) && $(call EXEC_TEENSY)
else ifeq (dfu,$(findstring dfu,$(BOOTLOADER))) else ifeq (dfu,$(findstring dfu,$(BOOTLOADER)))
$(UNSYNC_OUTPUT_CMD) && $(call EXEC_DFU) $(UNSYNC_OUTPUT_CMD) && $(call EXEC_DFU)
else ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp)) else ifeq ($(strip $(BOOTLOADER)), usbasploader)
$(UNSYNC_OUTPUT_CMD) && $(call EXEC_USBASP) $(UNSYNC_OUTPUT_CMD) && $(call EXEC_USBASP)
else ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID)) else ifeq ($(strip $(BOOTLOADER)), bootloadhid)
$(UNSYNC_OUTPUT_CMD) && $(call EXEC_BOOTLOADHID) $(UNSYNC_OUTPUT_CMD) && $(call EXEC_BOOTLOADHID)
else ifeq ($(strip $(BOOTLOADER)), qmk-hid) else ifeq ($(strip $(BOOTLOADER)), qmk-hid)
$(UNSYNC_OUTPUT_CMD) && $(call EXEC_HID_LUFA) $(UNSYNC_OUTPUT_CMD) && $(call EXEC_HID_LUFA)