aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-23 04:02:16 +0000
committerQMK Bot <hello@qmk.fm>2020-12-23 04:02:16 +0000
commit19fd0108d3910b4856b1587acf11c8e4052cb7cc (patch)
tree4bd249538732512de966d768016169f383f21acc
parent529dad88ddac0e64fce06bd6744884606f9d07cd (diff)
parent806aa9bc67c77c3899e60c1daef560680865568c (diff)
downloadqmk_firmware-19fd0108d3910b4856b1587acf11c8e4052cb7cc.tar.gz
qmk_firmware-19fd0108d3910b4856b1587acf11c8e4052cb7cc.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/boston_meetup/2019/rules.mk1
-rwxr-xr-xkeyboards/ckeys/thedora/rules.mk1
-rw-r--r--keyboards/clueboard/66_hotswap/gen1/rules.mk1
-rw-r--r--keyboards/hadron/ver3/rules.mk1
-rw-r--r--keyboards/infinity60/rules.mk1
-rw-r--r--keyboards/jm60/rules.mk1
-rw-r--r--keyboards/planck/ez/rules.mk1
-rwxr-xr-xkeyboards/planck/keymaps/ishtob/rule.mk1
-rw-r--r--keyboards/planck/rev6/rules.mk1
-rw-r--r--keyboards/preonic/rev3/rules.mk1
-rw-r--r--keyboards/tkc/candybar/lefty/rules.mk1
-rw-r--r--keyboards/tkc/candybar/righty/rules.mk1
-rw-r--r--quantum/mcu_selection.mk1
13 files changed, 0 insertions, 13 deletions
diff --git a/keyboards/boston_meetup/2019/rules.mk b/keyboards/boston_meetup/2019/rules.mk
index 9076d9ab4..7b9df20a8 100644
--- a/keyboards/boston_meetup/2019/rules.mk
+++ b/keyboards/boston_meetup/2019/rules.mk
@@ -7,7 +7,6 @@ BOARD = QMK_PROTON_C
7# 7#
8BACKLIGHT_ENABLE = no 8BACKLIGHT_ENABLE = no
9BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration 9BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
10## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
11MOUSEKEY_ENABLE = yes # Mouse keys 10MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control 11EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug 12CONSOLE_ENABLE = no # Console for debug
diff --git a/keyboards/ckeys/thedora/rules.mk b/keyboards/ckeys/thedora/rules.mk
index 8394b1a6c..aa378710c 100755
--- a/keyboards/ckeys/thedora/rules.mk
+++ b/keyboards/ckeys/thedora/rules.mk
@@ -7,7 +7,6 @@ BOARD = QMK_PROTON_C
7# 7#
8BACKLIGHT_ENABLE = no 8BACKLIGHT_ENABLE = no
9BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration 9BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
10## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
11MOUSEKEY_ENABLE = yes # Mouse keys 10MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control 11EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug 12CONSOLE_ENABLE = no # Console for debug
diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk
index d02ad56ba..18e01fcd1 100644
--- a/keyboards/clueboard/66_hotswap/gen1/rules.mk
+++ b/keyboards/clueboard/66_hotswap/gen1/rules.mk
@@ -10,7 +10,6 @@ LED_MATRIX_DRIVER = IS31FL3731
10# comment out to disable the options. 10# comment out to disable the options.
11# 11#
12BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration 12BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
13## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
14MOUSEKEY_ENABLE = yes # Mouse keys 13MOUSEKEY_ENABLE = yes # Mouse keys
15EXTRAKEY_ENABLE = yes # Audio control and System control 14EXTRAKEY_ENABLE = yes # Audio control and System control
16CONSOLE_ENABLE = yes # Console for debug 15CONSOLE_ENABLE = yes # Console for debug
diff --git a/keyboards/hadron/ver3/rules.mk b/keyboards/hadron/ver3/rules.mk
index e75b0c721..ae7f67862 100644
--- a/keyboards/hadron/ver3/rules.mk
+++ b/keyboards/hadron/ver3/rules.mk
@@ -7,7 +7,6 @@ BOARD = QMK_PROTON_C
7# 7#
8BACKLIGHT_ENABLE = no 8BACKLIGHT_ENABLE = no
9BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration 9BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration
10## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
11MOUSEKEY_ENABLE = yes # Mouse keys 10MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control 11EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug 12CONSOLE_ENABLE = no # Console for debug
diff --git a/keyboards/infinity60/rules.mk b/keyboards/infinity60/rules.mk
index dce10b571..8f962a53d 100644
--- a/keyboards/infinity60/rules.mk
+++ b/keyboards/infinity60/rules.mk
@@ -17,7 +17,6 @@ BOARD = MCHCK_K20
17# comment out to disable the options. 17# comment out to disable the options.
18# 18#
19BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration 19BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
20## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
21MOUSEKEY_ENABLE = yes # Mouse keys 20MOUSEKEY_ENABLE = yes # Mouse keys
22EXTRAKEY_ENABLE = yes # Audio control and System control 21EXTRAKEY_ENABLE = yes # Audio control and System control
23CONSOLE_ENABLE = yes # Console for debug 22CONSOLE_ENABLE = yes # Console for debug
diff --git a/keyboards/jm60/rules.mk b/keyboards/jm60/rules.mk
index a513461fc..2a2a080b7 100644
--- a/keyboards/jm60/rules.mk
+++ b/keyboards/jm60/rules.mk
@@ -8,7 +8,6 @@ BOARD = JM60_BOARD
8# comment out to disable the options. 8# comment out to disable the options.
9# 9#
10BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration 10BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
11## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
12MOUSEKEY_ENABLE = no # Mouse keys 11MOUSEKEY_ENABLE = no # Mouse keys
13EXTRAKEY_ENABLE = yes # Audio control and System control 12EXTRAKEY_ENABLE = yes # Audio control and System control
14CONSOLE_ENABLE = no # Console for debug 13CONSOLE_ENABLE = no # Console for debug
diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk
index 716e5feda..71f0a5fd1 100644
--- a/keyboards/planck/ez/rules.mk
+++ b/keyboards/planck/ez/rules.mk
@@ -7,7 +7,6 @@ BOARD = QMK_PROTON_C
7# the appropriate keymap folder that will get included automatically 7# the appropriate keymap folder that will get included automatically
8# 8#
9BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration 9BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
10## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
11MOUSEKEY_ENABLE = yes # Mouse keys 10MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control 11EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = yes # Console for debug 12CONSOLE_ENABLE = yes # Console for debug
diff --git a/keyboards/planck/keymaps/ishtob/rule.mk b/keyboards/planck/keymaps/ishtob/rule.mk
index 0f71be62b..a6ffdf639 100755
--- a/keyboards/planck/keymaps/ishtob/rule.mk
+++ b/keyboards/planck/keymaps/ishtob/rule.mk
@@ -3,7 +3,6 @@
3# 3#
4BACKLIGHT_ENABLE = no 4BACKLIGHT_ENABLE = no
5BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration 5BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
6## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
7MOUSEKEY_ENABLE = yes # Mouse keys 6MOUSEKEY_ENABLE = yes # Mouse keys
8EXTRAKEY_ENABLE = yes # Audio control and System control 7EXTRAKEY_ENABLE = yes # Audio control and System control
9CONSOLE_ENABLE = yes # Console for debug 8CONSOLE_ENABLE = yes # Console for debug
diff --git a/keyboards/planck/rev6/rules.mk b/keyboards/planck/rev6/rules.mk
index fc43bef57..c3fcf3dbd 100644
--- a/keyboards/planck/rev6/rules.mk
+++ b/keyboards/planck/rev6/rules.mk
@@ -7,7 +7,6 @@ BOARD = QMK_PROTON_C
7# the appropriate keymap folder that will get included automatically 7# the appropriate keymap folder that will get included automatically
8# 8#
9BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration 9BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
10## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
11MOUSEKEY_ENABLE = yes # Mouse keys 10MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control 11EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = yes # Console for debug 12CONSOLE_ENABLE = yes # Console for debug
diff --git a/keyboards/preonic/rev3/rules.mk b/keyboards/preonic/rev3/rules.mk
index e4d48e5b5..1f62fa55e 100644
--- a/keyboards/preonic/rev3/rules.mk
+++ b/keyboards/preonic/rev3/rules.mk
@@ -7,7 +7,6 @@ BOARD = QMK_PROTON_C
7# the appropriate keymap folder that will get included automatically 7# the appropriate keymap folder that will get included automatically
8# 8#
9BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration 9BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
10## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
11MOUSEKEY_ENABLE = yes # Mouse keys 10MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control 11EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = yes # Console for debug 12CONSOLE_ENABLE = yes # Console for debug
diff --git a/keyboards/tkc/candybar/lefty/rules.mk b/keyboards/tkc/candybar/lefty/rules.mk
index 1edad0835..c761d2b30 100644
--- a/keyboards/tkc/candybar/lefty/rules.mk
+++ b/keyboards/tkc/candybar/lefty/rules.mk
@@ -8,7 +8,6 @@ MCU = STM32F072
8LTO_ENABLE = yes 8LTO_ENABLE = yes
9BACKLIGHT_ENABLE = no 9BACKLIGHT_ENABLE = no
10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration 10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
11## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
12MOUSEKEY_ENABLE = no # Mouse keys 11MOUSEKEY_ENABLE = no # Mouse keys
13EXTRAKEY_ENABLE = yes # Audio control and System control 12EXTRAKEY_ENABLE = yes # Audio control and System control
14CONSOLE_ENABLE = no # Console for debug 13CONSOLE_ENABLE = no # Console for debug
diff --git a/keyboards/tkc/candybar/righty/rules.mk b/keyboards/tkc/candybar/righty/rules.mk
index 1edad0835..c761d2b30 100644
--- a/keyboards/tkc/candybar/righty/rules.mk
+++ b/keyboards/tkc/candybar/righty/rules.mk
@@ -8,7 +8,6 @@ MCU = STM32F072
8LTO_ENABLE = yes 8LTO_ENABLE = yes
9BACKLIGHT_ENABLE = no 9BACKLIGHT_ENABLE = no
10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration 10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
11## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
12MOUSEKEY_ENABLE = no # Mouse keys 11MOUSEKEY_ENABLE = no # Mouse keys
13EXTRAKEY_ENABLE = yes # Audio control and System control 12EXTRAKEY_ENABLE = yes # Audio control and System control
14CONSOLE_ENABLE = no # Console for debug 13CONSOLE_ENABLE = no # Console for debug
diff --git a/quantum/mcu_selection.mk b/quantum/mcu_selection.mk
index 9518a6463..6b11eb498 100644
--- a/quantum/mcu_selection.mk
+++ b/quantum/mcu_selection.mk
@@ -16,7 +16,6 @@ ifneq ($(findstring MKL26Z64, $(MCU)),)
16 # Linker script to use 16 # Linker script to use
17 # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ 17 # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
18 # or <keyboard_dir>/ld/ 18 # or <keyboard_dir>/ld/
19 # - NOTE: a custom ld script is needed for EEPROM on Teensy LC
20 MCU_LDSCRIPT ?= MKL26Z64 19 MCU_LDSCRIPT ?= MKL26Z64
21 20
22 # Startup code to use 21 # Startup code to use
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-02 05:19:19 +0000