diff options
author | Drashna Jaelre <drashna@live.com> | 2019-08-20 15:39:24 -0700 |
---|---|---|
committer | Yan-Fa Li <yanfali@gmail.com> | 2019-08-20 15:39:24 -0700 |
commit | 4003d077cef42d7a3405250ea6417db3a3549e9e (patch) | |
tree | 012079bc5fac326baafaba6514843e7ef0a05e5e /tmk_core/chibios.mk | |
parent | 91ee6a1dbb6f43ac708b0dc301f5cbcef6dcfdf5 (diff) | |
download | qmk_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.mk | 26 |
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 | ||
237 | dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter | 237 | define EXEC_DFU_UTIL |
238 | $(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin | 238 | $(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin |
239 | endef | ||
239 | 240 | ||
241 | dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter | ||
242 | $(call EXEC_DFU_UTIL) | ||
240 | 243 | ||
241 | ifneq ($(strip $(TIME_DELAY)),) | 244 | ifneq ($(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 | ||
258 | st-link-cli: $(BUILD_DIR)/$(TARGET).hex sizeafter | 261 | st-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 |
269 | endif | 272 | endif |
270 | 273 | ||
271 | teensy: $(BUILD_DIR)/$(TARGET).hex cpfirmware sizeafter | 274 | define 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 |
276 | endef | ||
277 | |||
278 | teensy: $(BUILD_DIR)/$(TARGET).hex cpfirmware sizeafter | ||
279 | $(call EXEC_TEENSY) | ||
273 | 280 | ||
274 | bin: $(BUILD_DIR)/$(TARGET).bin sizeafter | 281 | bin: $(BUILD_DIR)/$(TARGET).bin sizeafter |
282 | $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin; | ||
283 | |||
284 | |||
285 | flash: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter | ||
286 | ifeq ($(strip $(BOOTLOADER)),dfu) | ||
287 | $(call EXEC_DFU_UTIL) | ||
288 | else ifeq ($(strip $(MCU_FAMILY)),KINETIS) | ||
289 | $(call EXEC_TEENSY) | ||
290 | else ifeq ($(strip $(MCU_FAMILY)),STM32) | ||
291 | $(call EXEC_DFU_UTIL) | ||
292 | else | ||
293 | $(PRINT_OK); $(SILENT) || printf "$(MSG_FLASH_BOOTLOADER)" | ||
294 | endif | ||