summaryrefslogtreecommitdiff
path: root/keyboards/meira
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/meira
parent430c37024e8de42bb735f26386f2b13f042e3569 (diff)
Remove unused _BOOTLOADER defines
Diffstat (limited to 'keyboards/meira')
-rw-r--r--keyboards/meira/featherble/config.h3
-rw-r--r--keyboards/meira/promicro/config.h2
-rw-r--r--keyboards/meira/rules.mk17
3 files changed, 8 insertions, 14 deletions
diff --git a/keyboards/meira/featherble/config.h b/keyboards/meira/featherble/config.h
index fb24c60795..5aa5c29503 100644
--- a/keyboards/meira/featherble/config.h
+++ b/keyboards/meira/featherble/config.h
@@ -40,9 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define B5_AUDIO
#define AUDIO_VOICES
-#define CATERINA_BOOTLOADER
-
-
// #define BACKLIGHT_PIN B7
// #define BACKLIGHT_BREATHING
//#define BACKLIGHT_LEVELS 3
diff --git a/keyboards/meira/promicro/config.h b/keyboards/meira/promicro/config.h
index 67e5ca06d1..22975f68c0 100644
--- a/keyboards/meira/promicro/config.h
+++ b/keyboards/meira/promicro/config.h
@@ -36,8 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LED_EN_PIN D2
#define UNUSED_PINS
-#define CATERINA_BOOTLOADER
-
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
diff --git a/keyboards/meira/rules.mk b/keyboards/meira/rules.mk
index 2796335b6a..7893e6556f 100644
--- a/keyboards/meira/rules.mk
+++ b/keyboards/meira/rules.mk
@@ -32,15 +32,14 @@ BOOTLOADER = caterina
# Interrupt driven control endpoint task(+60)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
-# Boot Section Size in *bytes*
-# Teensy halfKay 512
-# Teensy++ halfKay 1024
-# Atmel DFU loader 4096
-# LUFA bootloader 4096
-# USBaspLoader 2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
+# Bootloader selection
+# Teensy halfkay
+# Pro Micro caterina
+# Atmel DFU atmel-dfu
+# LUFA DFU lufa-dfu
+# QMK DFU qmk-dfu
+# atmega32a bootloadHID
+BOOTLOADER = caterina
# Build Options
# change yes to no to disable