Merge remote-tracking branch 'origin/master' into develop

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