summaryrefslogtreecommitdiff
path: root/keyboards/ferris
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-12-13 02:06:27 +0000
committerQMK Bot <hello@qmk.fm>2021-12-13 02:06:27 +0000
commitc03859a3e4df00b22998b62f2f83684dd2851212 (patch)
tree1459ea75ad90b984100d4e2489b13787fb70cf5f /keyboards/ferris
parent415faebd6563fa07e2f0c830546217bdb621128f (diff)
parentf718a10889e6adf33f3fc2f41b61cad7fe9e0c2e (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/ferris')
-rw-r--r--keyboards/ferris/0_1/rules.mk1
-rw-r--r--keyboards/ferris/0_2/rules.mk1
2 files changed, 2 insertions, 0 deletions
diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk
index 996e2af6b9..86db6e4d12 100644
--- a/keyboards/ferris/0_1/rules.mk
+++ b/keyboards/ferris/0_1/rules.mk
@@ -4,6 +4,7 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
+# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk
index de18ee5a87..0c12328cee 100644
--- a/keyboards/ferris/0_2/rules.mk
+++ b/keyboards/ferris/0_2/rules.mk
@@ -4,6 +4,7 @@ MCU = STM32F072
# Bootloader selection
BOOTLOADER = stm32-dfu
+# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite