aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/chibios.mk
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-08-20 15:39:24 -0700
committerYan-Fa Li <yanfali@gmail.com>2019-08-20 15:39:24 -0700
commit4003d077cef42d7a3405250ea6417db3a3549e9e (patch)
tree012079bc5fac326baafaba6514843e7ef0a05e5e /tmk_core/chibios.mk
parent91ee6a1dbb6f43ac708b0dc301f5cbcef6dcfdf5 (diff)
downloadqmk_firmware-4003d077cef42d7a3405250ea6417db3a3549e9e.tar.gz
qmk_firmware-4003d077cef42d7a3405250ea6417db3a3549e9e.zip
Add a universal flash command for cli (#6224)
* Add universal flash command * Add bootloader info to I:C boards * Add support for ATSAM * Add messages for flash target * Message cleanup * Add USB ASP Flashing target * Make usbasp target more universal * Add phoney target for usbasp * Clarify error message when bootloader isn't matched
Diffstat (limited to 'tmk_core/chibios.mk')
-rw-r--r--tmk_core/chibios.mk26
1 files changed, 23 insertions, 3 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index 4aebb4776..eee520467 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -234,9 +234,12 @@ qmk: $(BUILD_DIR)/$(TARGET).bin
234 zip $(TARGET).qmk -urj $(BUILD_DIR)/$(TARGET).json 234 zip $(TARGET).qmk -urj $(BUILD_DIR)/$(TARGET).json
235 printf "@ $(TARGET).json\n@=info.json\n" | zipnote -w $(TARGET).qmk 235 printf "@ $(TARGET).json\n@=info.json\n" | zipnote -w $(TARGET).qmk
236 236
237dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter 237define EXEC_DFU_UTIL
238 $(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin 238 $(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin
239endef
239 240
241dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter
242 $(call EXEC_DFU_UTIL)
240 243
241ifneq ($(strip $(TIME_DELAY)),) 244ifneq ($(strip $(TIME_DELAY)),)
242 TIME_DELAY = $(strip $(TIME_DELAY)) 245 TIME_DELAY = $(strip $(TIME_DELAY))
@@ -253,7 +256,7 @@ dfu-util-wait: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter
253 done; \ 256 done; \
254 echo "Flashing $(TARGET).bin" ;\ 257 echo "Flashing $(TARGET).bin" ;\
255 sleep 1 ;\ 258 sleep 1 ;\
256 $(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin 259 $(call EXEC_DFU_UTIL)
257 260
258st-link-cli: $(BUILD_DIR)/$(TARGET).hex sizeafter 261st-link-cli: $(BUILD_DIR)/$(TARGET).hex sizeafter
259 $(ST_LINK_CLI) $(ST_LINK_ARGS) -q -c SWD -p $(BUILD_DIR)/$(TARGET).hex -Rst 262 $(ST_LINK_CLI) $(ST_LINK_ARGS) -q -c SWD -p $(BUILD_DIR)/$(TARGET).hex -Rst
@@ -268,7 +271,24 @@ ifndef TEENSY_LOADER_CLI
268 endif 271 endif
269endif 272endif
270 273
271teensy: $(BUILD_DIR)/$(TARGET).hex cpfirmware sizeafter 274define EXEC_TEENSY
272 $(TEENSY_LOADER_CLI) -mmcu=$(MCU_LDSCRIPT) -w -v $(BUILD_DIR)/$(TARGET).hex 275 $(TEENSY_LOADER_CLI) -mmcu=$(MCU_LDSCRIPT) -w -v $(BUILD_DIR)/$(TARGET).hex
276endef
277
278teensy: $(BUILD_DIR)/$(TARGET).hex cpfirmware sizeafter
279 $(call EXEC_TEENSY)
273 280
274bin: $(BUILD_DIR)/$(TARGET).bin sizeafter 281bin: $(BUILD_DIR)/$(TARGET).bin sizeafter
282 $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin;
283
284
285flash: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter
286ifeq ($(strip $(BOOTLOADER)),dfu)
287 $(call EXEC_DFU_UTIL)
288else ifeq ($(strip $(MCU_FAMILY)),KINETIS)
289 $(call EXEC_TEENSY)
290else ifeq ($(strip $(MCU_FAMILY)),STM32)
291 $(call EXEC_DFU_UTIL)
292else
293 $(PRINT_OK); $(SILENT) || printf "$(MSG_FLASH_BOOTLOADER)"
294endif