aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml4
-rw-r--r--keyboards/candybar/rules.mk1
-rw-r--r--keyboards/clueboard/60/rules.mk1
-rw-r--r--keyboards/clueboard/66/rev4/rules.mk1
-rw-r--r--keyboards/clueboard/66_hotswap/gen1/rules.mk1
-rw-r--r--keyboards/dztech/dz40rgb/rules.mk1
-rw-r--r--keyboards/dztech/dz60rgb/rules.mk1
-rw-r--r--keyboards/ergodox_infinity/rules.mk1
-rw-r--r--keyboards/hs60/v2/keymaps/ansi_via/rules.mk1
-rw-r--r--keyboards/hs60/v2/keymaps/default_via/rules.mk1
-rw-r--r--keyboards/hs60/v2/keymaps/goatmaster/rules.mk1
-rw-r--r--keyboards/hs60/v2/keymaps/hhkb_via/rules.mk1
-rw-r--r--keyboards/hs60/v2/keymaps/iso_andys8/rules.mk1
-rw-r--r--keyboards/hs60/v2/keymaps/stanrc85/rules.mk1
-rw-r--r--keyboards/hs60/v2/keymaps/win_osx_dual/rules.mk1
-rw-r--r--keyboards/hs60/v2/rules.mk1
-rw-r--r--keyboards/infinity60/rules.mk1
-rw-r--r--keyboards/k_type/rules.mk1
-rw-r--r--keyboards/vinta/rules.mk1
-rw-r--r--keyboards/whitefox/rules.mk1
-rw-r--r--quantum/mcu_selection.mk1
-rw-r--r--quantum/stm32/proton_c.mk1
-rw-r--r--tmk_core/chibios.mk5
23 files changed, 30 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index a50b205ec..796be6c04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,14 @@ env:
13 - MAKEFLAGS="-j3 --output-sync" 13 - MAKEFLAGS="-j3 --output-sync"
14before_install: 14before_install:
15 - wget http://ww1.microchip.com/downloads/en/DeviceDoc/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz || wget http://qmk.fm/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz 15 - wget http://ww1.microchip.com/downloads/en/DeviceDoc/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz || wget http://qmk.fm/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
16 # Need DFU > .5 for dfu-suffix
17 - sudo add-apt-repository --yes ppa:tormodvolden/ppa
18 - sudo apt-get update -qq
16install: 19install:
17 - tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz 20 - tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
18 - export PATH="$PATH:$TRAVIS_BUILD_DIR/avr8-gnu-toolchain-linux_x86_64/bin" 21 - export PATH="$PATH:$TRAVIS_BUILD_DIR/avr8-gnu-toolchain-linux_x86_64/bin"
19 - npm install -g moxygen 22 - npm install -g moxygen
23 - sudo apt-get -y --force-yes install dfu-util
20before_script: 24before_script:
21 - avr-gcc --version 25 - avr-gcc --version
22script: 26script:
diff --git a/keyboards/candybar/rules.mk b/keyboards/candybar/rules.mk
index 6f39ee0e7..0bc9a5b3e 100644
--- a/keyboards/candybar/rules.mk
+++ b/keyboards/candybar/rules.mk
@@ -31,6 +31,7 @@ OPT_DEFS =
31 31
32# Options to pass to dfu-util when flashing 32# Options to pass to dfu-util when flashing
33DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 33DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
34DFU_SUFFIX_ARGS = -p DF11 -v 0483
34 35
35# Build Options 36# Build Options
36# comment out to disable the options. 37# comment out to disable the options.
diff --git a/keyboards/clueboard/60/rules.mk b/keyboards/clueboard/60/rules.mk
index aada07352..a0927025b 100644
--- a/keyboards/clueboard/60/rules.mk
+++ b/keyboards/clueboard/60/rules.mk
@@ -35,6 +35,7 @@ OPT_DEFS =
35 35
36# Options to pass to dfu-util when flashing 36# Options to pass to dfu-util when flashing
37DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 37DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
38DFU_SUFFIX_ARGS = -p DF11 -v 0483
38 39
39# Build Options 40# Build Options
40# comment out to disable the options. 41# comment out to disable the options.
diff --git a/keyboards/clueboard/66/rev4/rules.mk b/keyboards/clueboard/66/rev4/rules.mk
index 846b1eee0..4d20ff2e9 100644
--- a/keyboards/clueboard/66/rev4/rules.mk
+++ b/keyboards/clueboard/66/rev4/rules.mk
@@ -13,6 +13,7 @@ OPT_DEFS =
13 13
14# Options to pass to dfu-util when flashing 14# Options to pass to dfu-util when flashing
15DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 15DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
16DFU_SUFFIX_ARGS = -p DF11 -v 0483
16 17
17# Build Options 18# Build Options
18# comment out to disable the options. 19# comment out to disable the options.
diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk
index 6b1ee92c1..326912a34 100644
--- a/keyboards/clueboard/66_hotswap/gen1/rules.mk
+++ b/keyboards/clueboard/66_hotswap/gen1/rules.mk
@@ -37,6 +37,7 @@ OPT_DEFS =
37 37
38# Options to pass to dfu-util when flashing 38# Options to pass to dfu-util when flashing
39DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 39DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
40DFU_SUFFIX_ARGS = -p DF11 -v 0483
40 41
41# LED Configuration 42# LED Configuration
42LED_MATRIX_ENABLE = IS31FL3731 43LED_MATRIX_ENABLE = IS31FL3731
diff --git a/keyboards/dztech/dz40rgb/rules.mk b/keyboards/dztech/dz40rgb/rules.mk
index 99cbafb8c..d0ddec838 100644
--- a/keyboards/dztech/dz40rgb/rules.mk
+++ b/keyboards/dztech/dz40rgb/rules.mk
@@ -40,6 +40,7 @@ OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
40 40
41# Options to pass to dfu-util when flashing 41# Options to pass to dfu-util when flashing
42DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 42DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
43DFU_SUFFIX_ARGS = -p DF11 -v 0483
43 44
44# Build Options 45# Build Options
45# comment out to disable the options. 46# comment out to disable the options.
diff --git a/keyboards/dztech/dz60rgb/rules.mk b/keyboards/dztech/dz60rgb/rules.mk
index 98e95c88d..20ca7f2eb 100644
--- a/keyboards/dztech/dz60rgb/rules.mk
+++ b/keyboards/dztech/dz60rgb/rules.mk
@@ -35,6 +35,7 @@ OPT_DEFS =
35 35
36# Options to pass to dfu-util when flashing 36# Options to pass to dfu-util when flashing
37DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 37DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
38DFU_SUFFIX_ARGS = -p DF11 -v 0483
38 39
39 40
40BACKLIGHT_ENABLE = no 41BACKLIGHT_ENABLE = no
diff --git a/keyboards/ergodox_infinity/rules.mk b/keyboards/ergodox_infinity/rules.mk
index 1cc95193c..af8e9ef20 100644
--- a/keyboards/ergodox_infinity/rules.mk
+++ b/keyboards/ergodox_infinity/rules.mk
@@ -59,6 +59,7 @@ OPT_DEFS += -DCORTEX_VTOR_INIT=0x00002000
59# 59#
60 60
61DFU_ARGS = -d 1c11:b007 61DFU_ARGS = -d 1c11:b007
62DFU_SUFFIX_ARGS = -p b007 -v 1c11
62 63
63BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) 64BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
64MOUSEKEY_ENABLE = yes # Mouse keys(+4700) 65MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
diff --git a/keyboards/hs60/v2/keymaps/ansi_via/rules.mk b/keyboards/hs60/v2/keymaps/ansi_via/rules.mk
index a2850a830..deb4fc889 100644
--- a/keyboards/hs60/v2/keymaps/ansi_via/rules.mk
+++ b/keyboards/hs60/v2/keymaps/ansi_via/rules.mk
@@ -45,6 +45,7 @@ OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
45 45
46# Options to pass to dfu-util when flashing 46# Options to pass to dfu-util when flashing
47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
48DFU_SUFFIX_ARGS = -p DF11 -v 0483
48 49
49# Build Options 50# Build Options
50# comment out to disable the options. 51# comment out to disable the options.
diff --git a/keyboards/hs60/v2/keymaps/default_via/rules.mk b/keyboards/hs60/v2/keymaps/default_via/rules.mk
index a2850a830..deb4fc889 100644
--- a/keyboards/hs60/v2/keymaps/default_via/rules.mk
+++ b/keyboards/hs60/v2/keymaps/default_via/rules.mk
@@ -45,6 +45,7 @@ OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
45 45
46# Options to pass to dfu-util when flashing 46# Options to pass to dfu-util when flashing
47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
48DFU_SUFFIX_ARGS = -p DF11 -v 0483
48 49
49# Build Options 50# Build Options
50# comment out to disable the options. 51# comment out to disable the options.
diff --git a/keyboards/hs60/v2/keymaps/goatmaster/rules.mk b/keyboards/hs60/v2/keymaps/goatmaster/rules.mk
index a2850a830..deb4fc889 100644
--- a/keyboards/hs60/v2/keymaps/goatmaster/rules.mk
+++ b/keyboards/hs60/v2/keymaps/goatmaster/rules.mk
@@ -45,6 +45,7 @@ OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
45 45
46# Options to pass to dfu-util when flashing 46# Options to pass to dfu-util when flashing
47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
48DFU_SUFFIX_ARGS = -p DF11 -v 0483
48 49
49# Build Options 50# Build Options
50# comment out to disable the options. 51# comment out to disable the options.
diff --git a/keyboards/hs60/v2/keymaps/hhkb_via/rules.mk b/keyboards/hs60/v2/keymaps/hhkb_via/rules.mk
index a2850a830..deb4fc889 100644
--- a/keyboards/hs60/v2/keymaps/hhkb_via/rules.mk
+++ b/keyboards/hs60/v2/keymaps/hhkb_via/rules.mk
@@ -45,6 +45,7 @@ OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
45 45
46# Options to pass to dfu-util when flashing 46# Options to pass to dfu-util when flashing
47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
48DFU_SUFFIX_ARGS = -p DF11 -v 0483
48 49
49# Build Options 50# Build Options
50# comment out to disable the options. 51# comment out to disable the options.
diff --git a/keyboards/hs60/v2/keymaps/iso_andys8/rules.mk b/keyboards/hs60/v2/keymaps/iso_andys8/rules.mk
index a2850a830..deb4fc889 100644
--- a/keyboards/hs60/v2/keymaps/iso_andys8/rules.mk
+++ b/keyboards/hs60/v2/keymaps/iso_andys8/rules.mk
@@ -45,6 +45,7 @@ OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
45 45
46# Options to pass to dfu-util when flashing 46# Options to pass to dfu-util when flashing
47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
48DFU_SUFFIX_ARGS = -p DF11 -v 0483
48 49
49# Build Options 50# Build Options
50# comment out to disable the options. 51# comment out to disable the options.
diff --git a/keyboards/hs60/v2/keymaps/stanrc85/rules.mk b/keyboards/hs60/v2/keymaps/stanrc85/rules.mk
index c46a6b952..817785d7a 100644
--- a/keyboards/hs60/v2/keymaps/stanrc85/rules.mk
+++ b/keyboards/hs60/v2/keymaps/stanrc85/rules.mk
@@ -45,6 +45,7 @@ OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
45 45
46# Options to pass to dfu-util when flashing 46# Options to pass to dfu-util when flashing
47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
48DFU_SUFFIX_ARGS = -p DF11 -v 0483
48 49
49# Build Options 50# Build Options
50# comment out to disable the options. 51# comment out to disable the options.
diff --git a/keyboards/hs60/v2/keymaps/win_osx_dual/rules.mk b/keyboards/hs60/v2/keymaps/win_osx_dual/rules.mk
index c89d90969..05193af4b 100644
--- a/keyboards/hs60/v2/keymaps/win_osx_dual/rules.mk
+++ b/keyboards/hs60/v2/keymaps/win_osx_dual/rules.mk
@@ -45,6 +45,7 @@ OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
45 45
46# Options to pass to dfu-util when flashing 46# Options to pass to dfu-util when flashing
47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
48DFU_SUFFIX_ARGS = -p DF11 -v 0483
48 49
49# Build Options 50# Build Options
50# comment out to disable the options. 51# comment out to disable the options.
diff --git a/keyboards/hs60/v2/rules.mk b/keyboards/hs60/v2/rules.mk
index 5659d28c9..64948c2e9 100644
--- a/keyboards/hs60/v2/rules.mk
+++ b/keyboards/hs60/v2/rules.mk
@@ -45,6 +45,7 @@ OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
45 45
46# Options to pass to dfu-util when flashing 46# Options to pass to dfu-util when flashing
47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 47DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
48DFU_SUFFIX_ARGS = -p DF11 -v 0483
48 49
49# Build Options 50# Build Options
50# comment out to disable the options. 51# comment out to disable the options.
diff --git a/keyboards/infinity60/rules.mk b/keyboards/infinity60/rules.mk
index 8cb2b3755..1f02e05c8 100644
--- a/keyboards/infinity60/rules.mk
+++ b/keyboards/infinity60/rules.mk
@@ -58,6 +58,7 @@ OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000
58# 58#
59 59
60DFU_ARGS = -d 1c11:b007 60DFU_ARGS = -d 1c11:b007
61DFU_SUFFIX_ARGS = -p b007 -v 1c11
61 62
62BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration 63BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
63## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.) 64## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
diff --git a/keyboards/k_type/rules.mk b/keyboards/k_type/rules.mk
index a1c56903b..7762f1868 100644
--- a/keyboards/k_type/rules.mk
+++ b/keyboards/k_type/rules.mk
@@ -57,6 +57,7 @@ ARMV = 7
57OPT_DEFS = 57OPT_DEFS =
58 58
59DFU_ARGS = -d 1c11:b007 59DFU_ARGS = -d 1c11:b007
60DFU_SUFFIX_ARGS = -p b007 -v 1c11
60 61
61# Build Options 62# Build Options
62# comment out to disable the options. 63# comment out to disable the options.
diff --git a/keyboards/vinta/rules.mk b/keyboards/vinta/rules.mk
index 9d89d9663..3ddb8d5bc 100644
--- a/keyboards/vinta/rules.mk
+++ b/keyboards/vinta/rules.mk
@@ -33,6 +33,7 @@ OPT_DEFS =
33 33
34# Options to pass to dfu-util when flashing 34# Options to pass to dfu-util when flashing
35DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 35DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
36DFU_SUFFIX_ARGS = -p DF11 -v 0483
36 37
37# Build Options 38# Build Options
38# comment out to disable the options. 39# comment out to disable the options.
diff --git a/keyboards/whitefox/rules.mk b/keyboards/whitefox/rules.mk
index 9f222bf4f..d9aa911c5 100644
--- a/keyboards/whitefox/rules.mk
+++ b/keyboards/whitefox/rules.mk
@@ -55,6 +55,7 @@ ARMV = 7
55OPT_DEFS = 55OPT_DEFS =
56 56
57DFU_ARGS = -d 1c11:b007 57DFU_ARGS = -d 1c11:b007
58DFU_SUFFIX_ARGS = -p b007 -v 1c11
58 59
59# Build Options 60# Build Options
60# comment out to disable the options. 61# comment out to disable the options.
diff --git a/quantum/mcu_selection.mk b/quantum/mcu_selection.mk
index 209b578ea..fa6dc8b53 100644
--- a/quantum/mcu_selection.mk
+++ b/quantum/mcu_selection.mk
@@ -34,6 +34,7 @@ ifneq ($(findstring STM32F303, $(MCU)),)
34 34
35 # Options to pass to dfu-util when flashing 35 # Options to pass to dfu-util when flashing
36 DFU_ARGS ?= -d 0483:df11 -a 0 -s 0x08000000:leave 36 DFU_ARGS ?= -d 0483:df11 -a 0 -s 0x08000000:leave
37 DFU_SUFFIX_ARGS = -p DF11 -v 0483
37endif 38endif
38 39
39ifneq (,$(filter $(MCU),atmega32u4 at90usb1286)) 40ifneq (,$(filter $(MCU),atmega32u4 at90usb1286))
diff --git a/quantum/stm32/proton_c.mk b/quantum/stm32/proton_c.mk
index a0fa01373..a65e283d3 100644
--- a/quantum/stm32/proton_c.mk
+++ b/quantum/stm32/proton_c.mk
@@ -42,3 +42,4 @@ OPT_DEFS =
42 42
43# Options to pass to dfu-util when flashing 43# Options to pass to dfu-util when flashing
44DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave 44DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
45DFU_SUFFIX_ARGS = -p df11 -v 0483
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index 01edebfd7..44c00bdd1 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -201,6 +201,7 @@ DFU_ARGS ?=
201ifneq ("$(SERIAL)","") 201ifneq ("$(SERIAL)","")
202 DFU_ARGS += -S $(SERIAL) 202 DFU_ARGS += -S $(SERIAL)
203endif 203endif
204DFU_SUFFIX_ARGS ?=
204 205
205ST_LINK_ARGS ?= 206ST_LINK_ARGS ?=
206 207
@@ -208,6 +209,7 @@ ST_LINK_ARGS ?=
208EXTRALIBDIRS = $(RULESPATH)/ld 209EXTRALIBDIRS = $(RULESPATH)/ld
209 210
210DFU_UTIL ?= dfu-util 211DFU_UTIL ?= dfu-util
212DFU_SUFFIX ?= dfu-suffix
211ST_LINK_CLI ?= st-link_cli 213ST_LINK_CLI ?= st-link_cli
212 214
213# Generate a .qmk for the QMK-FF 215# Generate a .qmk for the QMK-FF
@@ -259,4 +261,7 @@ st-link-cli: $(BUILD_DIR)/$(TARGET).hex sizeafter
259 $(ST_LINK_CLI) $(ST_LINK_ARGS) -q -c SWD -p $(BUILD_DIR)/$(TARGET).hex -Rst 261 $(ST_LINK_CLI) $(ST_LINK_ARGS) -q -c SWD -p $(BUILD_DIR)/$(TARGET).hex -Rst
260 262
261bin: $(BUILD_DIR)/$(TARGET).bin sizeafter 263bin: $(BUILD_DIR)/$(TARGET).bin sizeafter
264 if [ ! -z "$(DFU_SUFFIX_ARGS)" ]; then \
265 $(DFU_SUFFIX) $(DFU_SUFFIX_ARGS) -a $(BUILD_DIR)/$(TARGET).bin 1>/dev/null ;\
266 fi
262 $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin; 267 $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-04 22:46:39 +0000