diff options
| author | QMK Bot <hello@qmk.fm> | 2021-09-28 20:09:18 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-09-28 20:09:18 +0000 |
| commit | 4b9b9ebff4c04df0cfa4be74208c9961c00d7679 (patch) | |
| tree | 0331b183031cae0870f95a6bd86763fb5fab32f8 | |
| parent | bc41d37bafefc098d36eabafdc8f4c23af188c34 (diff) | |
| parent | 873a1999bb962834d88713796741c22339fb670f (diff) | |
| download | qmk_firmware-4b9b9ebff4c04df0cfa4be74208c9961c00d7679.tar.gz qmk_firmware-4b9b9ebff4c04df0cfa4be74208c9961c00d7679.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | message.mk | 1 | ||||
| -rw-r--r-- | tmk_core/rules.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/message.mk b/message.mk index 419e3f5f31..cb4ef43719 100644 --- a/message.mk +++ b/message.mk @@ -88,6 +88,7 @@ endef MSG_AVAILABLE_KEYMAPS = $(eval $(call GENERATE_MSG_AVAILABLE_KEYMAPS))$(MSG_AVAILABLE_KEYMAPS_ACTUAL) MSG_CHECK_FILESIZE = Checking file size of $(TARGET).$(FIRMWARE_FORMAT) +MSG_CHECK_FILESIZE_SKIPPED = (Firmware size check does not yet support $(MCU_ORIG); skipping) MSG_FILE_TOO_BIG = $(ERROR_COLOR)The firmware is too large!$(NO_COLOR) $(CURRENT_SIZE)/$(MAX_SIZE) ($(OVER_SIZE) bytes over)\n MSG_FILE_TOO_SMALL = The firmware is too small! $(CURRENT_SIZE)/$(MAX_SIZE)\n MSG_FILE_JUST_RIGHT = The firmware size is fine - $(CURRENT_SIZE)/$(MAX_SIZE) ($(PERCENT_SIZE)%%, $(FREE_SIZE) bytes free)\n diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 5a7f299102..fd59fa032a 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -484,7 +484,7 @@ check-size: fi else check-size: - $(SILENT) || echo "(Firmware size check does not yet support $(MCU) microprocessors; skipping.)" + $(SILENT) || echo "$(MSG_CHECK_FILESIZE_SKIPPED)" endif check-md5: |