From 5a9af8e24a2b79f1cfa9ab3e5bf10540cd4eb2b3 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 29 Aug 2022 06:20:43 +1000
Subject: [PATCH] Remove deprecated USBasp and bootloadHID bootloader types
 (#18195)

---
 builddefs/bootloader.mk          | 4 ++--
 data/schemas/keyboard.jsonschema | 2 --
 platforms/avr/flash.mk           | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index 9f555364236d..31004cab98af 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 0308f451167e..b534f28c9f22 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 6d50e72534e1..cd980b97337c 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)