diff options
| author | QMK Bot <hello@qmk.fm> | 2025-11-27 13:37:29 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2025-11-27 13:37:29 +0000 |
| commit | 9acd127cc1318d761aac76a806189fadeaaa247a (patch) | |
| tree | af6649c0034b51d0595855cbb692256ae17d97dd /platforms/chibios | |
| parent | 9ab8e4cd5a9d21f45c9f68c718c7c31765e0a321 (diff) | |
| parent | 9c2ca00074784dbee27b459d71cfc8e75f47b976 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'platforms/chibios')
| -rw-r--r-- | platforms/chibios/flash.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platforms/chibios/flash.mk b/platforms/chibios/flash.mk index f4db17a58b..0734754834 100644 --- a/platforms/chibios/flash.mk +++ b/platforms/chibios/flash.mk | |||
| @@ -77,10 +77,10 @@ st-flash: $(BUILD_DIR)/$(TARGET).hex sizeafter | |||
| 77 | 77 | ||
| 78 | # Autodetect teensy loader | 78 | # Autodetect teensy loader |
| 79 | ifndef TEENSY_LOADER_CLI | 79 | ifndef TEENSY_LOADER_CLI |
| 80 | ifneq (, $(shell which teensy-loader-cli 2>/dev/null)) | 80 | ifneq (, $(shell which teensy_loader_cli 2>/dev/null)) |
| 81 | TEENSY_LOADER_CLI ?= teensy-loader-cli | ||
| 82 | else | ||
| 83 | TEENSY_LOADER_CLI ?= teensy_loader_cli | 81 | TEENSY_LOADER_CLI ?= teensy_loader_cli |
| 82 | else | ||
| 83 | TEENSY_LOADER_CLI ?= teensy-loader-cli | ||
| 84 | endif | 84 | endif |
| 85 | endif | 85 | endif |
| 86 | 86 | ||