diff options
| author | skullydazed <skullydazed@users.noreply.github.com> | 2018-01-28 11:11:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-28 11:11:28 -0800 |
| commit | 9bfaf66792310fae2d525633b280b354babca026 (patch) | |
| tree | 16e801302a9adfa6fcacb3ab16d1244b52ca0200 | |
| parent | f0f991dd89733b7dc9ca54042923c031b3b3ca73 (diff) | |
Always copy the firmware file to the root qmk_firmware directory (#2314)
* Always copy the firmware file to the root qmk_firmware directory
* remove circular dependency
| -rw-r--r-- | build_keyboard.mk | 4 | ||||
| -rw-r--r-- | tmk_core/avr.mk | 2 | ||||
| -rw-r--r-- | tmk_core/chibios.mk | 2 | ||||
| -rw-r--r-- | tmk_core/rules.mk | 8 |
4 files changed, 9 insertions, 7 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index cbdaaa0104..bee8fcc874 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk @@ -113,9 +113,11 @@ endif # We can assume a ChibiOS target When MCU_FAMILY is defined , since it's not used for LUFA ifdef MCU_FAMILY + FIRMWARE_FORMAT=bin PLATFORM=CHIBIOS else PLATFORM=AVR + FIRMWARE_FORMAT=hex endif ifeq ($(PLATFORM),CHIBIOS) @@ -270,7 +272,7 @@ $(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG) all: build check-size # Change the build target to build a HEX file or a library. -build: elf cphex +build: elf cpfirmware #build: elf hex eep lss sym #build: lib diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 30d4fe26ee..24722736ee 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -136,7 +136,7 @@ flip: $(BUILD_DIR)/$(TARGET).hex check-size DFU_PROGRAMMER ?= dfu-programmer -dfu: $(BUILD_DIR)/$(TARGET).hex check-size +dfu: $(BUILD_DIR)/$(TARGET).hex cpfirmware check-size until $(DFU_PROGRAMMER) $(MCU) get bootloader-version; do\ echo "Error: Bootloader not found. Trying again in 5s." ;\ sleep 5 ;\ diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index cb0482d757..df9fa84981 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -220,7 +220,7 @@ qmk: $(BUILD_DIR)/$(TARGET).bin zip $(TARGET).qmk -urj $(BUILD_DIR)/$(TARGET).json printf "@ $(TARGET).json\n@=info.json\n" | zipnote -w $(TARGET).qmk -dfu-util: $(BUILD_DIR)/$(TARGET).bin sizeafter +dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter $(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin bin: $(BUILD_DIR)/$(TARGET).bin sizeafter diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 920a7f6add..7a282caccd 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -216,9 +216,9 @@ MOVE_DEP = mv -f $(patsubst %.o,%.td,$@) $(patsubst %.o,%.d,$@) elf: $(BUILD_DIR)/$(TARGET).elf hex: $(BUILD_DIR)/$(TARGET).hex -cphex: hex - $(SILENT) || printf "Copying $(TARGET).hex to qmk_firmware folder" | $(AWK_CMD) - $(COPY) $(BUILD_DIR)/$(TARGET).hex $(TARGET).hex && $(PRINT_OK) +cpfirmware: $(FIRMWARE_FORMAT) + $(SILENT) || printf "Copying $(TARGET).$(FIRMWARE_FORMAT) to qmk_firmware folder" | $(AWK_CMD) + $(COPY) $(BUILD_DIR)/$(TARGET).$(FIRMWARE_FORMAT) $(TARGET).$(FIRMWARE_FORMAT) && $(PRINT_OK) eep: $(BUILD_DIR)/$(TARGET).eep lss: $(BUILD_DIR)/$(TARGET).lss sym: $(BUILD_DIR)/$(TARGET).sym @@ -392,4 +392,4 @@ $(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir -p $(OUTPUT) 2>/dev/null))) .PHONY : all finish sizebefore sizeafter qmkversion \ gccversion build elf hex eep lss sym coff extcoff \ clean clean_list debug gdb-config show_path \ -program teensy dfu flip dfu-ee flip-ee dfu-start
\ No newline at end of file +program teensy dfu flip dfu-ee flip-ee dfu-start |