aboutsummaryrefslogtreecommitdiff
path: root/build_keyboard.mk
diff options
context:
space:
mode:
authorskullydazed <skullydazed@users.noreply.github.com>2018-01-28 11:11:28 -0800
committerGitHub <noreply@github.com>2018-01-28 11:11:28 -0800
commit9bfaf66792310fae2d525633b280b354babca026 (patch)
tree16e801302a9adfa6fcacb3ab16d1244b52ca0200 /build_keyboard.mk
parentf0f991dd89733b7dc9ca54042923c031b3b3ca73 (diff)
downloadqmk_firmware-9bfaf66792310fae2d525633b280b354babca026.tar.gz
qmk_firmware-9bfaf66792310fae2d525633b280b354babca026.zip
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.mk4
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
113 113
114# We can assume a ChibiOS target When MCU_FAMILY is defined , since it's not used for LUFA 114# We can assume a ChibiOS target When MCU_FAMILY is defined , since it's not used for LUFA
115ifdef MCU_FAMILY 115ifdef MCU_FAMILY
116 FIRMWARE_FORMAT=bin
116 PLATFORM=CHIBIOS 117 PLATFORM=CHIBIOS
117else 118else
118 PLATFORM=AVR 119 PLATFORM=AVR
120 FIRMWARE_FORMAT=hex
119endif 121endif
120 122
121ifeq ($(PLATFORM),CHIBIOS) 123ifeq ($(PLATFORM),CHIBIOS)
@@ -270,7 +272,7 @@ $(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG)
270all: build check-size 272all: build check-size
271 273
272# Change the build target to build a HEX file or a library. 274# Change the build target to build a HEX file or a library.
273build: elf cphex 275build: elf cpfirmware
274#build: elf hex eep lss sym 276#build: elf hex eep lss sym
275#build: lib 277#build: lib
276 278