diff options
| author | QMK Bot <hello@qmk.fm> | 2021-08-10 08:03:36 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-08-10 08:03:36 +0000 |
| commit | 75a58c3cef4a4b95f3c5e39d6d90723be10103b7 (patch) | |
| tree | 3985f3cdd5fb1a5ff7081c2d2cf6546dd2185558 /tmk_core | |
| parent | 85090b77af0343122ee62a41cf6940712f85d4f6 (diff) | |
| parent | d3932a104cb1db7e9436f5c16ee58cf3684e8b3a (diff) | |
| download | qmk_firmware-75a58c3cef4a4b95f3c5e39d6d90723be10103b7.tar.gz qmk_firmware-75a58c3cef4a4b95f3c5e39d6d90723be10103b7.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index d942e7ade..a44e15700 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk | |||
| @@ -248,7 +248,12 @@ hid_bootloader: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware | |||
| 248 | 248 | ||
| 249 | # Convert hex to bin. | 249 | # Convert hex to bin. |
| 250 | bin: $(BUILD_DIR)/$(TARGET).hex | 250 | bin: $(BUILD_DIR)/$(TARGET).hex |
| 251 | ifeq ($(BOOTLOADER),lufa-ms) | ||
| 252 | $(eval BIN_PADDING=$(shell n=`expr 32768 - $(BOOTLOADER_SIZE)` && echo $$(($$n)) || echo 0)) | ||
| 253 | $(OBJCOPY) -Iihex -Obinary $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin --pad-to $(BIN_PADDING) | ||
| 254 | else | ||
| 251 | $(OBJCOPY) -Iihex -Obinary $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin | 255 | $(OBJCOPY) -Iihex -Obinary $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin |
| 256 | endif | ||
| 252 | $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin; | 257 | $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin; |
| 253 | 258 | ||
| 254 | # copy bin to FLASH.bin | 259 | # copy bin to FLASH.bin |