Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

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

Browse source
This commit is contained in:
QMK Bot 2022-10-03 01:26:40 +00:00
commit f5df1b155a
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
platforms/arm_atsam/flash.mk
View file

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

1
platforms/avr/flash.mk
View file

@ -169,6 +169,7 @@ hid_bootloader: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
$(call EXEC_HID_LUFA) $(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)),) ifneq ($(strip $(PROGRAM_CMD)),)
$(UNSYNC_OUTPUT_CMD) && $(PROGRAM_CMD) $(UNSYNC_OUTPUT_CMD) && $(PROGRAM_CMD)
else ifeq ($(strip $(BOOTLOADER)), caterina) else ifeq ($(strip $(BOOTLOADER)), caterina)

2
platforms/chibios/flash.mk
View file

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