Remove unused _BOOTLOADER defines

diff --git a/keyboards/alice/config.h b/keyboards/alice/config.h
index 07b9599f58e2a80215093c2c2c8696b7058b5b2d..2200fbbe464db8dad6b4fc4bbfe0dcc3ab3e6bac 100644 (file)
--- a/keyboards/alice/config.h
+++ b/keyboards/alice/config.h
@@ -36,4 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_ANIMATIONS
 
 #define NO_UART 1
-#define BOOTLOADHID_BOOTLOADER 1

diff --git a/keyboards/ergo42/rev1/config.h b/keyboards/ergo42/rev1/config.h
index 68a5e2bbe5f5e239b5aa7504a96343a08a2d127a..f8fae93cf40f68d19ab070fd166c2220a4e4070c 100644 (file)
--- a/keyboards/ergo42/rev1/config.h
+++ b/keyboards/ergo42/rev1/config.h
@@ -40,8 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
 // #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
 
-#define CATERINA_BOOTLOADER
-
 /* define tapping term */
 #define TAPPING_TERM 100
 

diff --git a/keyboards/ergo42/rules.mk b/keyboards/ergo42/rules.mk
index 286c5fccb5061e00c186d1a9d8de6d1c95cd32c0..d8544d9ba05cc347fe33fbdf012588002460b4a1 100644 (file)
--- a/keyboards/ergo42/rules.mk
+++ b/keyboards/ergo42/rules.mk
@@ -43,13 +43,15 @@ F_USB = $(F_CPU)
 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 to "no" to disable the options, or define them in the Makefile in

diff --git a/keyboards/helix/rev1/config.h b/keyboards/helix/rev1/config.h
index 454e8ee628a0d81778b58d9fa1949477db0b0eed..61fe744728b10dd0e4a284b12a1ff1f3d44599ee 100644 (file)
--- a/keyboards/helix/rev1/config.h
+++ b/keyboards/helix/rev1/config.h
@@ -51,8 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
 // #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
 
-#define CATERINA_BOOTLOADER
-
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 

diff --git a/keyboards/helix/rules.mk b/keyboards/helix/rules.mk
index b3eea4028e35247e1c2cd2b9b06b854450e090ed..245bff70fa9a99a5ad7794162797729984a931b7 100644 (file)
--- a/keyboards/helix/rules.mk
+++ b/keyboards/helix/rules.mk
@@ -37,10 +37,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)

diff --git a/keyboards/jj50/config.h b/keyboards/jj50/config.h
index 0f09f02ff87bfbed29ea9e6fe3a14f6a735e5c60..0d35e3129e948592f920139ca42b177bc6bc9c95 100644 (file)
--- a/keyboards/jj50/config.h
+++ b/keyboards/jj50/config.h
@@ -46,6 +46,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 18
 
 #define NO_UART 1
-#define BOOTLOADHID_BOOTLOADER 1
 
 #endif

diff --git a/keyboards/jj50/rules.mk b/keyboards/jj50/rules.mk
index 4ee5719185eade98ae452d1cba2aa6f29b763850..2390d9631e36d9b109146f97dc9959627844fb35 100644 (file)
--- a/keyboards/jj50/rules.mk
+++ b/keyboards/jj50/rules.mk
@@ -25,10 +25,13 @@ NO_SUSPEND_POWER_DOWN = yes
 # processor frequency
 F_CPU = 12000000
 
-# 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 = bootloadHID
 
 # build options

diff --git a/keyboards/lets_split/keymaps/zer09/config.h b/keyboards/lets_split/keymaps/zer09/config.h
index 14be4ccc59b1c8369f08043f723d48e7860aa9bf..3990c3dc5bfcd45e1bf1652566f0561920bc44fe 100644 (file)
--- a/keyboards/lets_split/keymaps/zer09/config.h
+++ b/keyboards/lets_split/keymaps/zer09/config.h
@@ -35,7 +35,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 { F7, B1, B3, B2, B6 }
 
-#define CATERINA_BOOTLOADER
 #define USB_MAX_POWER_CONSUMPTION 50
 
 /* Use I2C or Serial, not both */

diff --git a/keyboards/lets_split/rules.mk b/keyboards/lets_split/rules.mk
index f9d1a0dadb467b241d20db768563b057257288a9..4899657357fa54d96dd0294aafb9137744e2713d 100644 (file)
--- a/keyboards/lets_split/rules.mk
+++ b/keyboards/lets_split/rules.mk
@@ -33,10 +33,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)

diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h
index 8fd42070e022a0092491b1c8bc889b6fadb0b919..4e8e3a7c9cdf8f5e26c14904e800841e0559112b 100644 (file)
--- 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 0ef951872eec997570b6232a716675ef0f46f66f..d13c88ba695af6f38f59456061173cf16b0272c6 100644 (file)
--- 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)

diff --git a/keyboards/meira/featherble/config.h b/keyboards/meira/featherble/config.h
index fb24c6079535a34422c743fbfa466e94df79668a..5aa5c29503ef2fe3e12f70bee0c7bfbe1a5d7a08 100644 (file)
--- 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 67e5ca06d18823885a8a116122da98acfc6a6b3a..22975f68c028369d51add0e410a057104ac9c439 100644 (file)
--- 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 2796335b6a9be6ea247db555bf9b5dd91ed9e4f2..7893e6556fc0f3f45dbbd2a4680b9998a725883d 100644 (file)
--- 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

diff --git a/keyboards/orthodox/rev3/config.h b/keyboards/orthodox/rev3/config.h
index ad3437a62626306e514ae564b445b7d0da80efcb..07ecb663bae1dc853db334e44e6cded820b3023a 100644 (file)
--- a/keyboards/orthodox/rev3/config.h
+++ b/keyboards/orthodox/rev3/config.h
@@ -48,8 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { D2, F5, F6, D6, D7, B4, B5, B6, F7 }
 /*/
 
-#define CATERINA_BOOTLOADER
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 

diff --git a/keyboards/skog/config.h b/keyboards/skog/config.h
index f518da8c9b0f7f486b3fcad977917c1987b9cb0b..ed7c558db7316b8e25105e4c5e6fda7028437445 100644 (file)
--- a/keyboards/skog/config.h
+++ b/keyboards/skog/config.h
@@ -34,6 +34,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 5
 
 #define NO_UART 1
-#define BOOTLOADHID_BOOTLOADER 1
 
 #endif

diff --git a/keyboards/winkeyless/bface/config.h b/keyboards/winkeyless/bface/config.h
index 7a1fe33354968a2b2d5de47f4caf775f2ab3c6ca..20f3642dc806f0be0effb56fc21f04c234dd67a5 100644 (file)
--- a/keyboards/winkeyless/bface/config.h
+++ b/keyboards/winkeyless/bface/config.h
@@ -38,7 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_ANIMATIONS
 
 #define NO_UART 1
-#define BOOTLOADHID_BOOTLOADER 1
 
 #ifdef BACKLIGHT_ENABLE
        // the backlight PWM does not work (yet). Therefore, we only have two backlight levels (on/off)

diff --git a/keyboards/winkeyless/bface/rules.mk b/keyboards/winkeyless/bface/rules.mk
index b6d172f266eca10e03e339ff39705d2a8b13d2ab..4e016b47dadf63bbdf08fa713c54ad34a0d86511 100644 (file)
--- a/keyboards/winkeyless/bface/rules.mk
+++ b/keyboards/winkeyless/bface/rules.mk
@@ -37,7 +37,7 @@ RGBLIGHT_ENABLE = yes
 RGBLIGHT_CUSTOM_DRIVER = yes
 
 OPT_DEFS = -DDEBUG_LEVEL=0
-OPT_DEFS += -DBOOTLOADER_SIZE=2048
+BOOTLOADER = bootloadHID
 
 # custom matrix setup
 SRC = i2c_master.c

diff --git a/keyboards/ymd75/config.h b/keyboards/ymd75/config.h
index 36031eebf5da80178a7fa3480eba181a3a02a112..6afd077b0a1ba24dc3b9271e2b827aeffc729332 100644 (file)
--- a/keyboards/ymd75/config.h
+++ b/keyboards/ymd75/config.h
@@ -46,6 +46,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_VAL_STEP 18
 
 #define NO_UART 1
-#define BOOTLOADHID_BOOTLOADER 1
 
 #endif

diff --git a/keyboards/ymd96/config.h b/keyboards/ymd96/config.h
index 51d42603dcb2eabec522cb3426f869e2a479f007..58169196b4a4e327d41833ca4812b0a0a6c9325a 100644 (file)
--- a/keyboards/ymd96/config.h
+++ b/keyboards/ymd96/config.h
@@ -51,7 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_ANIMATIONS
 /*#define RGBLIGHT_VAL_STEP 20
 
-#define NO_UART 1
-#define BOOTLOADHID_BOOTLOADER 1*/
+#define NO_UART 1*/
 
 #endif