Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
75a58c3cef
@ -248,7 +248,12 @@ hid_bootloader: $(BUILD_DIR)/$(TARGET).hex check-size cpfirmware
|
||||
|
||||
# Convert hex to bin.
|
||||
bin: $(BUILD_DIR)/$(TARGET).hex
|
||||
ifeq ($(BOOTLOADER),lufa-ms)
|
||||
$(eval BIN_PADDING=$(shell n=`expr 32768 - $(BOOTLOADER_SIZE)` && echo $$(($$n)) || echo 0))
|
||||
$(OBJCOPY) -Iihex -Obinary $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin --pad-to $(BIN_PADDING)
|
||||
else
|
||||
$(OBJCOPY) -Iihex -Obinary $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).bin
|
||||
endif
|
||||
$(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin;
|
||||
|
||||
# copy bin to FLASH.bin
|
||||
|
Loading…
Reference in New Issue
Block a user