From f4b03b7e34613cb9f39b7a586c32a383c9bb552a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 20 Oct 2020 13:07:33 -0600 Subject: [PATCH] Fix building production hex file with atmel-dfu bootloader --- tmk_core/avr.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index ecd2fd39a48..c15e83ad848 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -319,6 +319,9 @@ extcoff: $(BUILD_DIR)/$(TARGET).elf $(COFFCONVERT) -O coff-ext-avr $< $(BUILD_DIR)/$(TARGET).cof bootloader: +ifeq ($(strip $(BOOTLOADER)), atmel-dfu) + cp util/bootloader_$(MCU)_1_0_0.hex $(TARGET)_bootloader.hex +else make -C lib/lufa/Bootloaders/DFU/ clean $(TMK_DIR)/make_dfu_header.sh $(ALL_CONFIGS) $(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) $(CFLAGS) $(OPT_DEFS) tmk_core/common/avr/bootloader_size.c 2> /dev/null | sed -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0)) @@ -328,6 +331,7 @@ bootloader: make -C lib/lufa/Bootloaders/DFU/ MCU=$(MCU) ARCH=$(ARCH) F_CPU=$(F_CPU) FLASH_SIZE_KB=$(FLASH_SIZE_KB) BOOT_SECTION_SIZE_KB=$(BOOT_SECTION_SIZE_KB) printf "BootloaderDFU.hex copied to $(TARGET)_bootloader.hex\n" cp lib/lufa/Bootloaders/DFU/BootloaderDFU.hex $(TARGET)_bootloader.hex +endif production: $(BUILD_DIR)/$(TARGET).hex bootloader cpfirmware @cat $(BUILD_DIR)/$(TARGET).hex | awk '/^:00000001FF/ == 0' > $(TARGET)_production.hex