diff options
| author | fauxpark <fauxpark@gmail.com> | 2021-09-10 17:36:17 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2021-09-10 17:36:17 +1000 |
| commit | a7c972b329d908d2bec683f83d9841bcbd0d6175 (patch) | |
| tree | 2aa606d68664780e0320db60bc4b18f8ddc77bd9 /platforms | |
| parent | c94cc1effaf0a71f62f5498b3437f22c96f18f74 (diff) | |
| parent | d5cb7de5e4ea60dce69764a627358d534af1f666 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'platforms')
| -rw-r--r-- | platforms/avr/flash.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platforms/avr/flash.mk b/platforms/avr/flash.mk index 0af1ebb1ce..985cb60e52 100644 --- a/platforms/avr/flash.mk +++ b/platforms/avr/flash.mk @@ -147,7 +147,7 @@ define EXEC_BOOTLOADHID done endef -bootloadHID: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware +bootloadhid: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware $(call EXEC_BOOTLOADHID) HID_BOOTLOADER_CLI ?= hid_bootloader_cli @@ -168,9 +168,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 ifeq ($(strip $(BOOTLOADER)), USBasp) +else ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp)) $(UNSYNC_OUTPUT_CMD) && $(call EXEC_USBASP) -else ifeq ($(strip $(BOOTLOADER)), bootloadHID) +else ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID)) $(UNSYNC_OUTPUT_CMD) && $(call EXEC_BOOTLOADHID) else ifeq ($(strip $(BOOTLOADER)), qmk-hid) $(UNSYNC_OUTPUT_CMD) && $(call EXEC_HID_LUFA) |