diff options
| author | skullydazed <skullydazed@users.noreply.github.com> | 2018-01-28 20:11:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-28 20:11:28 +0100 |
| commit | 9bfaf66792310fae2d525633b280b354babca026 (patch) | |
| tree | 16e801302a9adfa6fcacb3ab16d1244b52ca0200 /build_keyboard.mk | |
| parent | f0f991dd89733b7dc9ca54042923c031b3b3ca73 (diff) | |
| download | qmk_firmware-9bfaf66792310fae2d525633b280b354babca026.tar.gz qmk_firmware-9bfaf66792310fae2d525633b280b354babca026.tar.xz | |
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
Diffstat (limited to 'build_keyboard.mk')
| -rw-r--r-- | build_keyboard.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index cbdaaa010..bee8fcc87 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 |