Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Don't search for TEENSY_LOADER_CLI if it's already defined

Browse source
This commit is contained in:
Fred Sundvik 2017-07-10 13:50:07 +03:00 committed by Jack Humbert
parent 7ea8753b72
commit ba405cfbb4
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tmk_core/avr.mk
View file

@ -87,12 +87,14 @@ DEBUG_PORT = 4242
DEBUG_HOST = localhost DEBUG_HOST = localhost
#============================================================================ #============================================================================
# Autodecct teensy loader # Autodetect teensy loader
ifndef TEENSY_LOADER_CLI
ifneq (, $(shell which teensy-loader-cli 2>/dev/null)) ifneq (, $(shell which teensy-loader-cli 2>/dev/null))
TEENSY_LOADER_CLI ?= teensy-loader-cli TEENSY_LOADER_CLI ?= teensy-loader-cli
else else
TEENSY_LOADER_CLI ?= teensy_loader_cli TEENSY_LOADER_CLI ?= teensy_loader_cli
endif endif
endif
# Program the device. # Program the device.
program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep program: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep