M keyboards/alice/config.h => keyboards/alice/config.h +0 -1
@@ 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
M keyboards/ergo42/rev1/config.h => keyboards/ergo42/rev1/config.h +0 -2
@@ 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
M keyboards/ergo42/rules.mk => keyboards/ergo42/rules.mk +9 -7
@@ 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
M keyboards/helix/rev1/config.h => keyboards/helix/rev1/config.h +0 -2
@@ 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
M keyboards/helix/rules.mk => keyboards/helix/rules.mk +7 -4
@@ 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)
M keyboards/jj50/config.h => keyboards/jj50/config.h +0 -1
@@ 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
M keyboards/jj50/rules.mk => keyboards/jj50/rules.mk +7 -4
@@ 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
M keyboards/lets_split/keymaps/zer09/config.h => keyboards/lets_split/keymaps/zer09/config.h +0 -1
@@ 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 */
M keyboards/lets_split/rules.mk => keyboards/lets_split/rules.mk +7 -4
@@ 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)
M keyboards/lily58/rev1/config.h => keyboards/lily58/rev1/config.h +1 -3
@@ 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
M keyboards/lily58/rules.mk => keyboards/lily58/rules.mk +7 -4
@@ 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)
M keyboards/meira/featherble/config.h => keyboards/meira/featherble/config.h +0 -3
@@ 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
M keyboards/meira/promicro/config.h => keyboards/meira/promicro/config.h +0 -2
@@ 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
M keyboards/meira/rules.mk => keyboards/meira/rules.mk +8 -9
@@ 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
M keyboards/orthodox/rev3/config.h => keyboards/orthodox/rev3/config.h +0 -2
@@ 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
M keyboards/skog/config.h => keyboards/skog/config.h +0 -1
@@ 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
M keyboards/winkeyless/bface/config.h => keyboards/winkeyless/bface/config.h +0 -1
@@ 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)
M keyboards/winkeyless/bface/rules.mk => keyboards/winkeyless/bface/rules.mk +1 -1
@@ 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
M keyboards/ymd75/config.h => keyboards/ymd75/config.h +0 -1
@@ 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
M keyboards/ymd96/config.h => keyboards/ymd96/config.h +1 -2
@@ 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