diff options
| author | QMK Bot | 2025-11-27 14:37:29 +0100 |
|---|---|---|
| committer | QMK Bot | 2025-11-27 14:37:29 +0100 |
| commit | 9acd127cc1318d761aac76a806189fadeaaa247a (patch) | |
| tree | af6649c0034b51d0595855cbb692256ae17d97dd /platforms | |
| parent | 9ab8e4cd5a9d21f45c9f68c718c7c31765e0a321 (diff) | |
| parent | 9c2ca00074784dbee27b459d71cfc8e75f47b976 (diff) | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'platforms')
| -rw-r--r-- | platforms/avr/flash.mk | 6 | ||||
| -rw-r--r-- | platforms/chibios/flash.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/platforms/avr/flash.mk b/platforms/avr/flash.mk index 51731f0aa8..bfb292224c 100644 --- a/platforms/avr/flash.mk +++ b/platforms/avr/flash.mk @@ -5,10 +5,10 @@ # Autodetect teensy loader ifndef TEENSY_LOADER_CLI - ifneq (, $(shell which teensy-loader-cli 2>/dev/null)) - TEENSY_LOADER_CLI ?= teensy-loader-cli - else + ifneq (, $(shell which teensy_loader_cli 2>/dev/null)) TEENSY_LOADER_CLI ?= teensy_loader_cli + else + TEENSY_LOADER_CLI ?= teensy-loader-cli endif endif 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 # Autodetect teensy loader ifndef TEENSY_LOADER_CLI - ifneq (, $(shell which teensy-loader-cli 2>/dev/null)) - TEENSY_LOADER_CLI ?= teensy-loader-cli - else + ifneq (, $(shell which teensy_loader_cli 2>/dev/null)) TEENSY_LOADER_CLI ?= teensy_loader_cli + else + TEENSY_LOADER_CLI ?= teensy-loader-cli endif endif |