Browse Source

Merge remote-tracking branch 'origin/master' into develop

pull/18574/head
QMK Bot 1 year ago
parent
commit
f5df1b155a
3 changed files with 4 additions and 2 deletions
  1. +1
    -0
      platforms/arm_atsam/flash.mk
  2. +2
    -1
      platforms/avr/flash.mk
  3. +1
    -1
      platforms/chibios/flash.mk

+ 1
- 0
platforms/arm_atsam/flash.mk View File

@ -13,6 +13,7 @@ mdloader: bin
$(call EXEC_MDLOADER)
flash: bin
$(SILENT) || printf "Flashing for bootloader: $(BLUE)$(BOOTLOADER)$(NO_COLOR)\n"
ifneq ($(strip $(PROGRAM_CMD)),)
$(UNSYNC_OUTPUT_CMD) && $(PROGRAM_CMD)
else ifeq ($(strip $(ARM_ATSAM)),SAMD51J18A)


+ 2
- 1
platforms/avr/flash.mk View File

@ -168,7 +168,8 @@ endef
hid_bootloader: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
$(call EXEC_HID_LUFA)
flash: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
flash: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
$(SILENT) || printf "Flashing for bootloader: $(BLUE)$(BOOTLOADER)$(NO_COLOR)\n"
ifneq ($(strip $(PROGRAM_CMD)),)
$(UNSYNC_OUTPUT_CMD) && $(PROGRAM_CMD)
else ifeq ($(strip $(BOOTLOADER)), caterina)


+ 1
- 1
platforms/chibios/flash.mk View File

@ -101,8 +101,8 @@ endef
teensy: $(BUILD_DIR)/$(TARGET).hex cpfirmware sizeafter
$(call EXEC_TEENSY)
flash: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter
$(SILENT) || printf "Flashing for bootloader: $(BLUE)$(BOOTLOADER)$(NO_COLOR)\n"
ifneq ($(strip $(PROGRAM_CMD)),)
$(UNSYNC_OUTPUT_CMD) && $(PROGRAM_CMD)
else ifeq ($(strip $(BOOTLOADER)),kiibohd)


Loading…
Cancel
Save