aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/lily58
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2019-08-02 13:47:52 +1000
committernoroadsleft <18669334+noroadsleft@users.noreply.github.com>2019-08-04 20:46:57 -0700
commit72f382fc02b3c5c81c54fd2d239d653fe2f8083c (patch)
tree4000273f563ec929108f95950916f8b703e17a96 /keyboards/lily58
parent430c37024e8de42bb735f26386f2b13f042e3569 (diff)
downloadfirmware-72f382fc02b3c5c81c54fd2d239d653fe2f8083c.tar.gz
firmware-72f382fc02b3c5c81c54fd2d239d653fe2f8083c.tar.bz2
firmware-72f382fc02b3c5c81c54fd2d239d653fe2f8083c.zip
Remove unused _BOOTLOADER defines
Diffstat (limited to 'keyboards/lily58')
-rw-r--r--keyboards/lily58/rev1/config.h4
-rw-r--r--keyboards/lily58/rules.mk11
2 files changed, 8 insertions, 7 deletions
diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h
index 8fd42070e..4e8e3a7c9 100644
--- a/keyboards/lily58/rev1/config.h
+++ b/keyboards/lily58/rev1/config.h
@@ -36,8 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-#define CATERINA_BOOTLOADER
-
/* define tapping term */
#define TAPPING_TERM 100
@@ -72,4 +70,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION \ No newline at end of file
+//#define NO_ACTION_FUNCTION
diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk
index 0ef951872..d13c88ba6 100644
--- a/keyboards/lily58/rules.mk
+++ b/keyboards/lily58/rules.mk
@@ -40,10 +40,13 @@ ARCH = AVR8
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB = $(F_CPU)
-# Bootloader
-# This definition is optional, and if your keyboard supports multiple bootloaders of
-# different sizes, comment this out, and the correct address will be loaded
-# automatically (+60). See bootloader.mk for all options.
+# Bootloader selection
+# Teensy halfkay
+# Pro Micro caterina
+# Atmel DFU atmel-dfu
+# LUFA DFU lufa-dfu
+# QMK DFU qmk-dfu
+# atmega32a bootloadHID
BOOTLOADER = caterina
# Interrupt driven control endpoint task(+60)