summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorJack Humbert2017-03-31 18:28:26 -0400
committerGitHub2017-03-31 18:28:26 -0400
commit3448d5d4874a2775f85320a2be69edd241575d46 (patch)
tree572b8740336e659fb784d9c8e46b35baf2225522 /tmk_core
parentec35fea26420dc7d11dfa464f912566e5a5424c1 (diff)
parent515b4dd1f7c941f9e96790f7433015fc9bd385bf (diff)
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.mk7
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)
DEBUG = gdb
+DFU_ARGS =
+ifneq ("$(SERIAL)","")
+ DFU_ARGS += -S $(SERIAL)
+endif
+
# List any extra directories to look for libraries here.
EXTRALIBDIRS = $(RULESPATH)/ld
dfu-util: $(BUILD_DIR)/$(TARGET).bin sizeafter
- dfu-util -D $(BUILD_DIR)/$(TARGET).bin \ No newline at end of file
+ dfu-util $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin