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) | |
| download | qmk_firmware-a7c972b329d908d2bec683f83d9841bcbd0d6175.tar.gz qmk_firmware-a7c972b329d908d2bec683f83d9841bcbd0d6175.zip | |
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 0af1ebb1c..985cb60e5 100644 --- a/platforms/avr/flash.mk +++ b/platforms/avr/flash.mk | |||
| @@ -147,7 +147,7 @@ define EXEC_BOOTLOADHID | |||
| 147 | done | 147 | done |
| 148 | endef | 148 | endef |
| 149 | 149 | ||
| 150 | bootloadHID: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware | 150 | bootloadhid: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware |
| 151 | $(call EXEC_BOOTLOADHID) | 151 | $(call EXEC_BOOTLOADHID) |
| 152 | 152 | ||
| 153 | HID_BOOTLOADER_CLI ?= hid_bootloader_cli | 153 | HID_BOOTLOADER_CLI ?= hid_bootloader_cli |
| @@ -168,9 +168,9 @@ else ifeq ($(strip $(BOOTLOADER)), halfkay) | |||
| 168 | $(UNSYNC_OUTPUT_CMD) && $(call EXEC_TEENSY) | 168 | $(UNSYNC_OUTPUT_CMD) && $(call EXEC_TEENSY) |
| 169 | else ifeq (dfu,$(findstring dfu,$(BOOTLOADER))) | 169 | else ifeq (dfu,$(findstring dfu,$(BOOTLOADER))) |
| 170 | $(UNSYNC_OUTPUT_CMD) && $(call EXEC_DFU) | 170 | $(UNSYNC_OUTPUT_CMD) && $(call EXEC_DFU) |
| 171 | else ifeq ($(strip $(BOOTLOADER)), USBasp) | 171 | else ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp)) |
| 172 | $(UNSYNC_OUTPUT_CMD) && $(call EXEC_USBASP) | 172 | $(UNSYNC_OUTPUT_CMD) && $(call EXEC_USBASP) |
| 173 | else ifeq ($(strip $(BOOTLOADER)), bootloadHID) | 173 | else ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID)) |
| 174 | $(UNSYNC_OUTPUT_CMD) && $(call EXEC_BOOTLOADHID) | 174 | $(UNSYNC_OUTPUT_CMD) && $(call EXEC_BOOTLOADHID) |
| 175 | else ifeq ($(strip $(BOOTLOADER)), qmk-hid) | 175 | else ifeq ($(strip $(BOOTLOADER)), qmk-hid) |
| 176 | $(UNSYNC_OUTPUT_CMD) && $(call EXEC_HID_LUFA) | 176 | $(UNSYNC_OUTPUT_CMD) && $(call EXEC_HID_LUFA) |