diff options
| author | QMK Bot <hello@qmk.fm> | 2022-10-03 01:26:40 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-10-03 01:26:40 +0000 |
| commit | f5df1b155af86bbe1833c2fdeca921e664c3c1f9 (patch) | |
| tree | c83f2c6fa198930a57bce6e8904a2d7f7f56cf69 /platforms | |
| parent | bdffe9efe8c7182fd3de3e2027becc173f8b79c2 (diff) | |
| parent | cc1565f2a3e46f6f364f872962ced35aef5ddae8 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'platforms')
| -rw-r--r-- | platforms/arm_atsam/flash.mk | 1 | ||||
| -rw-r--r-- | platforms/avr/flash.mk | 3 | ||||
| -rw-r--r-- | platforms/chibios/flash.mk | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/platforms/arm_atsam/flash.mk b/platforms/arm_atsam/flash.mk index 8152610ceb..8068c08d57 100644 --- a/platforms/arm_atsam/flash.mk +++ b/platforms/arm_atsam/flash.mk @@ -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) diff --git a/platforms/avr/flash.mk b/platforms/avr/flash.mk index cd980b9733..4c4ac70512 100644 --- a/platforms/avr/flash.mk +++ b/platforms/avr/flash.mk @@ -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) diff --git a/platforms/chibios/flash.mk b/platforms/chibios/flash.mk index 2802368b5d..6e23d96e1c 100644 --- a/platforms/chibios/flash.mk +++ b/platforms/chibios/flash.mk @@ -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) |