summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2022-08-29 06:20:43 +1000
committerGitHub <noreply@github.com>2022-08-28 21:20:43 +0100
commitd18698a8e8d83d47d48b8501932e6a046148f95a (patch)
treed5f4b28e672a8ade588544d61af5d6e789dd4771
parent8fc62cb09844b635039f1a1b1349f445920ee118 (diff)
Remove deprecated USBasp and bootloadHID bootloader types (#18195)
-rw-r--r--builddefs/bootloader.mk4
-rw-r--r--data/schemas/keyboard.jsonschema2
-rw-r--r--platforms/avr/flash.mk4
3 files changed, 4 insertions, 6 deletions
diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index 9f55536423..31004cab98 100644
--- a/builddefs/bootloader.mk
+++ b/builddefs/bootloader.mk
@@ -116,13 +116,13 @@ ifeq ($(strip $(BOOTLOADER)), caterina)
BOOTLOADER_SIZE = 4096
endif
-ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID))
+ifeq ($(strip $(BOOTLOADER)), bootloadhid)
OPT_DEFS += -DBOOTLOADER_BOOTLOADHID
BOOTLOADER_TYPE = bootloadhid
BOOTLOADER_SIZE = 4096
endif
-ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp))
+ifeq ($(strip $(BOOTLOADER)), usbasploader)
OPT_DEFS += -DBOOTLOADER_USBASP
BOOTLOADER_TYPE = usbasploader
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 0308f45116..b534f28c9f 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -89,7 +89,6 @@
"enum": [
"atmel-dfu",
"bootloadhid",
- "bootloadHID",
"caterina",
"custom",
"gd32v-dfu",
@@ -106,7 +105,6 @@
"tinyuf2",
"unknown",
"usbasploader",
- "USBasp",
"wb32-dfu"
]
},
diff --git a/platforms/avr/flash.mk b/platforms/avr/flash.mk
index 6d50e72534..cd980b9733 100644
--- a/platforms/avr/flash.mk
+++ b/platforms/avr/flash.mk
@@ -177,9 +177,9 @@ else ifeq ($(strip $(BOOTLOADER)), halfkay)
$(UNSYNC_OUTPUT_CMD) && $(call EXEC_TEENSY)
else ifeq (dfu,$(findstring dfu,$(BOOTLOADER)))
$(UNSYNC_OUTPUT_CMD) && $(call EXEC_DFU)
-else ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp))
+else ifeq ($(strip $(BOOTLOADER)), usbasploader)
$(UNSYNC_OUTPUT_CMD) && $(call EXEC_USBASP)
-else ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID))
+else ifeq ($(strip $(BOOTLOADER)), bootloadhid)
$(UNSYNC_OUTPUT_CMD) && $(call EXEC_BOOTLOADHID)
else ifeq ($(strip $(BOOTLOADER)), qmk-hid)
$(UNSYNC_OUTPUT_CMD) && $(call EXEC_HID_LUFA)