Move Bootmagic config to data driven (#19860)

keyboards/0xcb/tutelpad/config.h

@@ -55,7 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0

keyboards/0xcb/tutelpad/info.json

@@ -8,6 +8,9 @@
         "pid": "0xF09F",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "matrix_pins": {

keyboards/a_dux/config.h

@@ -26,10 +26,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SOFT_SERIAL_PIN D1
 
 #define EE_HANDS
-
-/* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 4

keyboards/a_dux/info.json

@@ -19,6 +19,9 @@
         ]
     },
     "split": {
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
         "matrix_pins": {
             "right": {
                 "direct": [

keyboards/adafruit/macropad/config.h

@@ -41,11 +41,6 @@
 #define ENCODERS_PAD_A { GP18 }
 #define ENCODERS_PAD_B { GP17 }
 
-/* Bootmagic lite */
-/* (Press the key below the encoder button while plugging the keyboard to enter the bootloader and clear flash) */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 2
-
 /* Double tap the side button to enter bootloader */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP13

keyboards/adafruit/macropad/info.json

@@ -8,6 +8,9 @@
         "pid": "0x0108",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 2]
+    },
     "processor": "RP2040",
     "bootloader": "rp2040",
     "matrix_pins": {

keyboards/afternoonlabs/breeze/rev0/config.h

@@ -32,6 +32,3 @@
 #define SOFT_SERIAL_PIN D2
 
 #define DIODE_DIRECTION COL2ROW
-
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 5

keyboards/afternoonlabs/breeze/rev0/info.json

@@ -8,6 +8,9 @@
         "pid": "0x0001",
         "device_version": "0.0.0"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/afternoonlabs/breeze/rev1/config.h

@@ -32,8 +32,3 @@
 #define SOFT_SERIAL_PIN D2
 
 #define DIODE_DIRECTION COL2ROW
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-#define BOOTMAGIC_LITE_ROW_LEFT 0
-#define BOOTMAGIC_LITE_COLUMN_LEFT 5

keyboards/afternoonlabs/breeze/rev1/info.json

@@ -8,6 +8,9 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/afternoonlabs/oceanbreeze/rev1/config.h

@@ -32,8 +32,3 @@
 #define SOFT_SERIAL_PIN D2
 
 #define DIODE_DIRECTION COL2ROW
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-#define BOOTMAGIC_LITE_ROW_LEFT 0
-#define BOOTMAGIC_LITE_COLUMN_LEFT 5

keyboards/afternoonlabs/oceanbreeze/rev1/info.json

@@ -8,6 +8,9 @@
         "pid": "0x0003",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/afternoonlabs/southern_breeze/rev1/config.h

@@ -32,8 +32,3 @@
 #define SOFT_SERIAL_PIN D2
 
 #define DIODE_DIRECTION COL2ROW
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-#define BOOTMAGIC_LITE_ROW_LEFT 0
-#define BOOTMAGIC_LITE_COLUMN_LEFT 5

keyboards/afternoonlabs/southern_breeze/rev1/info.json

@@ -8,6 +8,9 @@
         "pid": "0x0005",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/afternoonlabs/summer_breeze/rev1/config.h

@@ -32,8 +32,3 @@
 #define SOFT_SERIAL_PIN D2
 
 #define DIODE_DIRECTION COL2ROW
-
-#define BOOTMAGIC_LITE_ROW_RIGHT 0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-#define BOOTMAGIC_LITE_ROW_LEFT 0
-#define BOOTMAGIC_LITE_COLUMN_LEFT 5

keyboards/afternoonlabs/summer_breeze/rev1/info.json

@@ -8,6 +8,9 @@
         "pid": "0x0004",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/alps64/config.h

@@ -34,10 +34,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* Bootmagic Lite Support*/
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 6
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

keyboards/alps64/info.json

@@ -8,6 +8,9 @@
         "pid": "0x6464",
         "device_version": "0.0.1"
     },
+  "bootmagic": {
+      "matrix": [3, 6]
+  },
   "processor": "atmega32u2",
   "bootloader": "atmel-dfu",
   "community_layouts": ["60_ansi"],

keyboards/ares/config.h

@@ -43,7 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 4
-#define BOOTMAGIC_LITE_COLUMN 0

keyboards/ares/info.json

@@ -8,6 +8,9 @@
         "pid": "0x422D",
         "device_version": "2.0.0"
     },
+    "bootmagic": {
+        "matrix": [4, 0]
+    },
     "processor": "atmega32a",
     "bootloader": "bootloadhid",
     "layout_aliases": {

keyboards/argo_works/ishi/80/mk0_avr/config.h

@@ -1,24 +0,0 @@
-// Copyright 2022 Jason Devadoss (@jasonj2232)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

keyboards/argo_works/ishi/80/mk0_avr/info.json

@@ -10,6 +10,9 @@
         "pid": "0x4930",
         "vid": "0x4157"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
     "features": {
         "bootmagic": true,
         "command": false,

keyboards/argo_works/ishi/80/mk0_avr_extra/config.h

@@ -1,28 +0,0 @@
-// Copyright 2022 Jason Devadoss (@jasonj2232)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
-
-//Uncomment the below if the encoder direction is flipped/opposite to what is expected
-
-//#define ENCODER_DIRECTION_FLIP
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT

keyboards/argo_works/ishi/80/mk0_avr_extra/info.json

@@ -11,6 +11,9 @@
         "pid": "0x4930",
         "vid": "0x4157"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
     "features": {
         "bootmagic": true,
         "command": false,

keyboards/ashpil/modelm_usbc/config.h

@@ -53,7 +53,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 2

keyboards/ashpil/modelm_usbc/info.json

@@ -8,6 +8,9 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
     "processor": "at90usb1286",
     "bootloader": "atmel-dfu",
     "layouts": {

keyboards/aves60/config.h

@@ -71,7 +71,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 4
-#define BOOTMAGIC_LITE_COLUMN 6

keyboards/aves60/info.json

@@ -8,6 +8,9 @@
         "pid": "0xD408",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [4, 6]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

keyboards/basekeys/trifecta/config.h

@@ -68,10 +68,6 @@
 /* EEPROM for via */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
-/* bootmagic row col assignment */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
-
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)

keyboards/basekeys/trifecta/info.json

@@ -8,6 +8,9 @@
         "pid": "0xEAF3",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

keyboards/beekeeb/piantor/config.h

@@ -10,6 +10,3 @@
 #define SERIAL_USART_FULL_DUPLEX
 #define SERIAL_USART_TX_PIN GP0
 #define SERIAL_USART_RX_PIN GP1
-
-#define BOOTMAGIC_LITE_ROW    0
-#define BOOTMAGIC_LITE_COLUMN 5

keyboards/beekeeb/piantor/info.json

@@ -18,6 +18,9 @@
         "pid": "0x0001",
         "vid": "0xBEEB"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "matrix_pins": {
         "direct": [
             ["GP5", "GP4", "GP11", "GP15", "GP3", "GP2"],

keyboards/cantor/config.h

@@ -7,13 +7,6 @@
 #define SERIAL_USART_TX_PIN B6     // USART TX pin
 #define SERIAL_USART_RX_PIN B7     // USART RX pin
 
-/* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW    0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT    4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

keyboards/cantor/info.json

@@ -28,6 +28,9 @@
         ]
     },
     "split": {
+        "bootmagic": {
+            "matrix": [4, 5]
+        },
         "matrix_pins": {
             "right": {
                 "direct": [

keyboards/controllerworks/mini42/config.h

@@ -36,10 +36,3 @@
 /* #define EE_HANDS  */
 /* #define MASTER_LEFT */
 /* #define MASTER_RIGHT */
-
-/* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW    0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT    0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0

keyboards/cradio/config.h

@@ -1,11 +0,0 @@
-// Copyright 2018-2021
-// ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
-// David Philip Barr <@davidphilipbarr>
-// Pierre Chevalier <pierrechevalier83@gmail.com>
-// SPDX-License-Identifier: GPL-2.0+
-
-#define BOOTMAGIC_LITE_ROW    0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT    4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 4

keyboards/cradio/info.json

@@ -29,6 +29,9 @@
         ]
     },
     "split": {
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
         "enabled": true,
         "matrix_pins": {
             "right": {

keyboards/delikeeb/waaffle/rev3/config.h

@@ -85,7 +85,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 6
-#define BOOTMAGIC_LITE_COLUMN 0

keyboards/delikeeb/waaffle/rev3/info.json

@@ -8,6 +8,9 @@
         "pid": "0x0012",
         "device_version": "0.0.3"
     },
+    "bootmagic": {
+        "matrix": [6, 0]
+    },
     "layouts": {
         "LAYOUT_ortho_5x16": {
             "layout":

keyboards/doodboard/duckboard_r2/config.h

@@ -41,6 +41,3 @@
 #ifdef RGBLIGHT_ENABLE
 #define RGBLED_NUM 8    // Number of LEDs
 #endif
-
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1

keyboards/doodboard/duckboard_r2/info.json

@@ -8,6 +8,9 @@
         "pid": "0x6462",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/doppelganger/config.h

@@ -74,7 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 2

keyboards/doppelganger/info.json

@@ -8,6 +8,9 @@
         "pid": "0x4447",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

keyboards/duck/eagle_viper/v2/config.h

@@ -39,8 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
-/* Set to top left most key */
-#define BOOTMAGIC_LITE_ROW 4
-#define BOOTMAGIC_LITE_COLUMN 10
-
 #define TAPPING_TERM 200

keyboards/duck/eagle_viper/v2/info.json

@@ -6,6 +6,9 @@
         "pid": "0x4556",
         "device_version": "0.0.2"
     },
+    "bootmagic": {
+        "matrix": [4, 10]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {

keyboards/duck/jetfire/config.h

@@ -40,10 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLED_NUM 23
 
-/* Set to top left most key */
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 10
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

keyboards/duck/jetfire/info.json

@@ -8,6 +8,9 @@
         "pid": "0x4A46",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [5, 10]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

keyboards/duck/lightsaver/config.h

@@ -39,8 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
-/* Set to top left most key */
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 10
-
 #define TAPPING_TERM 200

keyboards/duck/lightsaver/info.json

@@ -8,6 +8,9 @@
     "pid": "0x4C53",
     "device_version": "0.0.3"
   },
+  "bootmagic": {
+    "matrix": [5, 10]
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {

keyboards/duck/octagon/v1/config.h

@@ -39,8 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
-/* Set to top left most key */
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 10
-
 #define TAPPING_TERM 200

keyboards/duck/octagon/v1/info.json

@@ -8,6 +8,9 @@
         "pid": "0x4F31",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [5, 10]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi"],

keyboards/duck/octagon/v2/config.h

@@ -39,8 +39,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 17
 
-/* Set to top left most key */
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 10
-
 #define TAPPING_TERM 200

keyboards/duck/octagon/v2/info.json

@@ -8,6 +8,9 @@
         "pid": "0x4F32",
         "device_version": "0.0.2"
     },
+    "bootmagic": {
+        "matrix": [5, 10]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["75_ansi"],

keyboards/duck/orion/v3/config.h

@@ -42,8 +42,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 18
 
-/* Set to top left most key */
-#define BOOTMAGIC_LITE_ROW 4
-#define BOOTMAGIC_LITE_COLUMN 10
-
 #define TAPPING_TERM 200

keyboards/duck/orion/v3/info.json

@@ -8,6 +8,9 @@
         "pid": "0x4F52",
         "device_version": "0.0.2"
     },
+    "bootmagic": {
+        "matrix": [4, 10]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["tkl_ansi"],

keyboards/duck/tcv3/config.h

@@ -36,7 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGB_DI_PIN D6
 #define RGBLED_NUM 17
-
-/* Set to top left most key */
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 10

keyboards/duck/tcv3/info.json

@@ -8,6 +8,9 @@
         "pid": "0x5443",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [5, 10]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

keyboards/dumbpad/v0x/config.h

@@ -30,7 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Onboard LEDs */
 #define LED_00 B3
 #define LED_01 B1
-
-/* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 0

keyboards/dumbpad/v0x/info.json

@@ -2,6 +2,9 @@
     "usb": {
         "device_version": "0.0.7"
     },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/dumbpad/v0x_dualencoder/config.h

@@ -30,7 +30,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Onboard LEDs */
 #define LED_00 B3
 #define LED_01 B1
-
-/* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 0

keyboards/dumbpad/v0x_dualencoder/info.json

@@ -2,6 +2,9 @@
     "usb": {
         "device_version": "0.0.6"
     },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/dumbpad/v0x_right/config.h

@@ -29,7 +29,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Onboard LEDs */
 #define LED_00 B1
 #define LED_01 B3
-
-/* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 4

keyboards/dumbpad/v0x_right/info.json

@@ -2,6 +2,9 @@
     "usb": {
         "device_version": "0.0.7"
     },
+    "bootmagic": {
+        "matrix": [3, 4]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/dumbpad/v1x/config.h

@@ -31,7 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_00 B6
 #define LED_01 B1
 #define LED_02 B3
-
-/* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 0

keyboards/dumbpad/v1x/info.json

@@ -2,6 +2,9 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/dumbpad/v1x_dualencoder/config.h

@@ -31,7 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_00 B6
 #define LED_01 B1
 #define LED_02 B3
-
-/* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 0

keyboards/dumbpad/v1x_dualencoder/info.json

@@ -2,6 +2,9 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/dumbpad/v1x_right/config.h

@@ -31,7 +31,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_00 B3
 #define LED_01 B1
 #define LED_02 B6
-
-/* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 4

keyboards/dumbpad/v1x_right/info.json

@@ -2,6 +2,9 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "bootmagic": {
+        "matrix": [3, 4]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/dumbpad/v3x/config.h

@@ -31,10 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_01 B3
 #define LED_02 B6
 
-/* Bootmagic - hold down rotary encoder pushbutton while plugging in to enter bootloader */
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 0
-
 #define RGB_DI_PIN D1
 #define RGB_MATRIX_LED_COUNT 16
 

keyboards/dumbpad/v3x/info.json

@@ -5,6 +5,9 @@
     "usb": {
         "device_version": "0.1.0"
     },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {

keyboards/eternal_keypad/config.h

@@ -78,7 +78,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1

keyboards/eternal_keypad/info.json

@@ -8,6 +8,9 @@
         "pid": "0xDB00",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

keyboards/evyd13/quackfire/config.h

@@ -63,8 +63,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 6
-#define BOOTMAGIC_LITE_COLUMN 5
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3

keyboards/evyd13/quackfire/info.json

@@ -8,6 +8,9 @@
         "pid": "0x87C9",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [6, 5]
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["tkl_ansi", "tkl_iso"],

keyboards/evyd13/wasdat/config.h

@@ -55,8 +55,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 5
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3

keyboards/evyd13/wasdat/info.json

@@ -10,6 +10,9 @@
         "pid": "0xC474",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "qmk_lufa_bootloader": {
         "esc_output": "D6",
         "esc_input": "D7",

keyboards/evyd13/wasdat_code/config.h

@@ -73,8 +73,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 2
-#define BOOTMAGIC_LITE_COLUMN 3
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3

keyboards/evyd13/wasdat_code/info.json

@@ -8,6 +8,9 @@
         "pid": "0xB00E",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [2, 3]
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["fullsize_ansi", "fullsize_iso", "tkl_ansi", "tkl_iso"],

keyboards/ferris/sweep/config.h

@@ -23,10 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SOFT_SERIAL_PIN D2
 
 #define EE_HANDS
-
-/* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW    0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT    4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 4

keyboards/ferris/sweep/info.json

@@ -17,6 +17,9 @@
         ]
     },
     "split": {
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
         "matrix_pins": {
             "right": {
                 "direct": [

keyboards/frooastboard/nano/config.h

@@ -21,9 +21,6 @@
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 2
 
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 1
-
 #define RGB_DI_PIN B4
 #define RGBLED_NUM 8
 

keyboards/frooastboard/nano/info.json

@@ -39,6 +39,9 @@
         "pid": "0x6F21",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 1]
+    },
     "processor": "atmega32u2",
     "bootloader": "atmel-dfu"
 }

keyboards/gboards/gergo/config.h

@@ -20,9 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define BOOTMAGIC_LITE_ROW 13
-#define BOOTMAGIC_LITE_COLUMN 2
-
 /* Defaults */
 #ifndef BALLSTEP
 #define BALLSTEP 20

keyboards/gboards/gergo/info.json

@@ -8,6 +8,9 @@
         "pid": "0x1307",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [13, 2]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layout_aliases": {

keyboards/gl516/xr63gl/config.h

@@ -21,9 +21,6 @@
 
 #define MATRIX_MASKED
 
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
-
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED_MASK 0U

keyboards/gl516/xr63gl/info.json

@@ -23,6 +23,9 @@
         "pid": "0x0001",
         "vid": "0x8686"
     },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
     "layouts": {
         "LAYOUT_63_ansi": {
             "layout": [

keyboards/gmmk/gmmk2/p65/ansi/info.json

@@ -8,6 +8,9 @@
         "pid": "0x5045",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
     "processor": "WB32F3G71",
     "bootloader": "wb32-dfu",
     "layouts": {

keyboards/gmmk/gmmk2/p65/config.h

@@ -29,10 +29,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Hold ESC on start up to clear EEPROM and boot into bootloader mode */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 3
-
 #define TAP_CODE_DELAY 10
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */

keyboards/gmmk/gmmk2/p65/iso/info.json

@@ -8,6 +8,9 @@
         "pid": "0x504A",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
     "processor": "WB32F3G71",
     "bootloader": "wb32-dfu",
     "layouts": {

keyboards/gmmk/pro/config.h

@@ -29,10 +29,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Hold ESC on start up to clear EEPROM and boot into bootloader mode */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 3
-
 #define TAP_CODE_DELAY 10
 #define ENCODERS_PAD_A \
     { C15 }

keyboards/gmmk/pro/rev1/ansi/info.json

@@ -8,6 +8,9 @@
         "pid": "0x5044",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "layouts": {

keyboards/gmmk/pro/rev1/iso/info.json

@@ -8,6 +8,9 @@
         "pid": "0x5044",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
     "processor": "STM32F303",
     "bootloader": "stm32-dfu",
     "layouts": {

keyboards/gmmk/pro/rev2/ansi/info.json

@@ -8,6 +8,9 @@
        "pid": "0x5044",
        "device_version": "0.0.2"
     },
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
     "processor": "WB32F3G71",
     "bootloader": "wb32-dfu",
     "layouts": {

keyboards/gmmk/pro/rev2/iso/info.json

@@ -8,6 +8,9 @@
        "pid": "0x5044",
        "device_version": "0.0.2"
     },
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
     "processor": "WB32F3G71",
     "bootloader": "wb32-dfu",
     "layouts": {

keyboards/gon/nerd60/config.h

@@ -20,7 +20,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* ROW and COL for ESC key */
-#define BOOTMAGIC_LITE_ROW 8
-#define BOOTMAGIC_LITE_COLUMN 0

keyboards/gon/nerd60/info.json

@@ -8,6 +8,9 @@
         "pid": "0x3630",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [8, 0]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],

keyboards/gon/nerdtkl/config.h

@@ -13,9 +13,6 @@
 #define MATRIX_ROW_PINS { B4, E2, F4, F7, F1, F6, C6, F5, D7, C7 }
 #define MATRIX_COL_PINS { E6, B0, B1, B2, B3, F0, D0, D5, D1 }
 
-#define BOOTMAGIC_LITE_ROW 8
-#define BOOTMAGIC_LITE_COLUMN 0
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 

keyboards/gon/nerdtkl/info.json

@@ -8,6 +8,9 @@
         "pid": "0x5244",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [8, 0]
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {

keyboards/handwired/brain/config.h

@@ -93,8 +93,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define TAPPING_TERM 150
 //#define IGNORE_MOD_TAP_INTERRUPT
 //#define QUICK_TAP_TERM 0
-
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 6
-#define BOOTMAGIC_LITE_ROW_RIGHT 5
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0