diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-07-10 10:35:45 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-07-10 10:35:45 -0400 |
| commit | 8d190d5e25b3374156264fde0ba5d78696cc74aa (patch) | |
| tree | 701f47510c11806b7c7df1fcb4ce32175f5ca1f4 /tmk_core | |
| parent | 62214986013ee6596afa55023f7a95a8527d910f (diff) | |
| parent | 10546665f4cdc25e3405bfa108b066004d436aea (diff) | |
| download | qmk_firmware-8d190d5e25b3374156264fde0ba5d78696cc74aa.tar.gz qmk_firmware-8d190d5e25b3374156264fde0ba5d78696cc74aa.zip | |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index ccecdb192..6773726ee 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk | |||
| @@ -87,11 +87,13 @@ DEBUG_PORT = 4242 | |||
| 87 | DEBUG_HOST = localhost | 87 | DEBUG_HOST = localhost |
| 88 | 88 | ||
| 89 | #============================================================================ | 89 | #============================================================================ |
| 90 | # Autodecct teensy loader | 90 | # Autodetect teensy loader |
| 91 | ifneq (, $(shell which teensy-loader-cli 2>/dev/null)) | 91 | ifndef TEENSY_LOADER_CLI |
| 92 | TEENSY_LOADER_CLI ?= teensy-loader-cli | 92 | ifneq (, $(shell which teensy-loader-cli 2>/dev/null)) |
| 93 | else | 93 | TEENSY_LOADER_CLI ?= teensy-loader-cli |
| 94 | TEENSY_LOADER_CLI ?= teensy_loader_cli | 94 | else |
| 95 | TEENSY_LOADER_CLI ?= teensy_loader_cli | ||
| 96 | endif | ||
| 95 | endif | 97 | endif |
| 96 | 98 | ||
| 97 | # Program the device. | 99 | # Program the device. |
| @@ -115,11 +117,11 @@ dfu: $(BUILD_DIR)/$(TARGET).hex sizeafter | |||
| 115 | echo "Error: Bootloader not found. Trying again in 5s." ;\ | 117 | echo "Error: Bootloader not found. Trying again in 5s." ;\ |
| 116 | sleep 5 ;\ | 118 | sleep 5 ;\ |
| 117 | done | 119 | done |
| 118 | ifneq (, $(findstring 0.7, $(shell $(DFU_PROGRAMMER) --version 2>&1))) | 120 | if $(DFU_PROGRAMMER) --version 2>&1 | grep -q 0.7 ; then\ |
| 119 | $(DFU_PROGRAMMER) $(MCU) erase --force | 121 | $(DFU_PROGRAMMER) $(MCU) erase --force;\ |
| 120 | else | 122 | else\ |
| 121 | $(DFU_PROGRAMMER) $(MCU) erase | 123 | $(DFU_PROGRAMMER) $(MCU) erase;\ |
| 122 | endif | 124 | fi |
| 123 | $(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex | 125 | $(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex |
| 124 | $(DFU_PROGRAMMER) $(MCU) reset | 126 | $(DFU_PROGRAMMER) $(MCU) reset |
| 125 | 127 | ||
| @@ -135,11 +137,11 @@ flip-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep | |||
| 135 | $(REMOVE) $(BUILD_DIR)/$(TARGET)eep.hex | 137 | $(REMOVE) $(BUILD_DIR)/$(TARGET)eep.hex |
| 136 | 138 | ||
| 137 | dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep | 139 | dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep |
| 138 | ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1))) | 140 | if $(DFU_PROGRAMMER) --version 2>&1 | grep -q 0.7 ; then\ |
| 139 | $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep | 141 | $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\ |
| 140 | else | 142 | else\ |
| 141 | $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep | 143 | $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep;\ |
| 142 | endif | 144 | fi |
| 143 | $(DFU_PROGRAMMER) $(MCU) reset | 145 | $(DFU_PROGRAMMER) $(MCU) reset |
| 144 | 146 | ||
| 145 | # Convert hex to bin. | 147 | # Convert hex to bin. |