diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-03-31 18:28:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 18:28:26 -0400 |
| commit | 3448d5d4874a2775f85320a2be69edd241575d46 (patch) | |
| tree | 572b8740336e659fb784d9c8e46b35baf2225522 /tmk_core | |
| parent | ec35fea26420dc7d11dfa464f912566e5a5424c1 (diff) | |
| parent | 515b4dd1f7c941f9e96790f7433015fc9bd385bf (diff) | |
| download | qmk_firmware-3448d5d4874a2775f85320a2be69edd241575d46.tar.gz qmk_firmware-3448d5d4874a2775f85320a2be69edd241575d46.zip | |
Merge pull request #1132 from akatrevorjay/pr/dfu-serial
Allow to specify serial to dfu-util flash
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/chibios.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 062a712bd..eb0c40138 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk | |||
| @@ -143,8 +143,13 @@ MCUFLAGS = -mcpu=$(MCU) | |||
| 143 | 143 | ||
| 144 | DEBUG = gdb | 144 | DEBUG = gdb |
| 145 | 145 | ||
| 146 | DFU_ARGS = | ||
| 147 | ifneq ("$(SERIAL)","") | ||
| 148 | DFU_ARGS += -S $(SERIAL) | ||
| 149 | endif | ||
| 150 | |||
| 146 | # List any extra directories to look for libraries here. | 151 | # List any extra directories to look for libraries here. |
| 147 | EXTRALIBDIRS = $(RULESPATH)/ld | 152 | EXTRALIBDIRS = $(RULESPATH)/ld |
| 148 | 153 | ||
| 149 | dfu-util: $(BUILD_DIR)/$(TARGET).bin sizeafter | 154 | dfu-util: $(BUILD_DIR)/$(TARGET).bin sizeafter |
| 150 | dfu-util -D $(BUILD_DIR)/$(TARGET).bin \ No newline at end of file | 155 | dfu-util $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin |