~ruther/qmk_firmware

f5df1b155af86bbe1833c2fdeca921e664c3c1f9 — QMK Bot 2 years ago bdffe9e + cc1565f
Merge remote-tracking branch 'origin/master' into develop
3 files changed, 4 insertions(+), 2 deletions(-)

M platforms/arm_atsam/flash.mk
M platforms/avr/flash.mk
M platforms/chibios/flash.mk
M platforms/arm_atsam/flash.mk => platforms/arm_atsam/flash.mk +1 -0
@@ 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)

M platforms/avr/flash.mk => platforms/avr/flash.mk +2 -1
@@ 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)

M platforms/chibios/flash.mk => platforms/chibios/flash.mk +1 -1
@@ 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)