Move Bootmagic config to data driven (#19860)

author: Ryan <fauxpark@gmail.com> 2023-02-17 08:49:49 +1100
committer: GitHub <noreply@github.com> 2023-02-17 08:49:49 +1100
commit: d784f78bd0a034c1d6085379615014fd701536ab (patch)
tree: 2b81c4e8848ebc8dece2ad9aaa8126d12a87825c
parent: 7fad94ba2d5092abe451d0bbc95caaa37fec95bc (diff)
281 files changed, 458 insertions, 700 deletions
diff --git a/keyboards/0xcb/tutelpad/config.h b/keyboards/0xcb/tutelpad/config.h
index d4ba1d439f..cdb29e6bd1 100644
--- a/keyboards/0xcb/tutelpad/config.h
+++ b/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
diff --git a/keyboards/0xcb/tutelpad/info.json b/keyboards/0xcb/tutelpad/info.json
index 25c0ca51c4..0d9585dbb5 100644
--- a/keyboards/0xcb/tutelpad/info.json
+++ b/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": {
diff --git a/keyboards/a_dux/config.h b/keyboards/a_dux/config.h
index d636139928..9f5876f2ef 100644
--- a/keyboards/a_dux/config.h
+++ b/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
diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json
index 6292d5e707..a19443cf7e 100644
--- a/keyboards/a_dux/info.json
+++ b/keyboards/a_dux/info.json
@@ -19,6 +19,9 @@
        ]
    },
    "split": {
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
        "matrix_pins": {
            "right": {
                "direct": [
diff --git a/keyboards/adafruit/macropad/config.h b/keyboards/adafruit/macropad/config.h
index 7f1170ef37..6f2c08c5e8 100644
--- a/keyboards/adafruit/macropad/config.h
+++ b/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
diff --git a/keyboards/adafruit/macropad/info.json b/keyboards/adafruit/macropad/info.json
index 588c51b008..824419580c 100644
--- a/keyboards/adafruit/macropad/info.json
+++ b/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": {
diff --git a/keyboards/afternoonlabs/breeze/rev0/config.h b/keyboards/afternoonlabs/breeze/rev0/config.h
index dbabe797c5..fffb1a89f3 100644
--- a/keyboards/afternoonlabs/breeze/rev0/config.h
+++ b/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
diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json
index 11e05ca08a..3bdd8fc9ce 100644
--- a/keyboards/afternoonlabs/breeze/rev0/info.json
+++ b/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": {
diff --git a/keyboards/afternoonlabs/breeze/rev1/config.h b/keyboards/afternoonlabs/breeze/rev1/config.h
index 5f23201e6a..3ce5f8eff8 100644
--- a/keyboards/afternoonlabs/breeze/rev1/config.h
+++ b/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
diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json
index 302b8eb7bd..d8c56fa121 100644
--- a/keyboards/afternoonlabs/breeze/rev1/info.json
+++ b/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": {
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
index cbb0577845..3a3bf56ccb 100644
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h
+++ b/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
diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
index 97e1a0f98e..d6b19b4d98 100644
--- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json
+++ b/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": {
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/config.h b/keyboards/afternoonlabs/southern_breeze/rev1/config.h
index 5f23201e6a..3ce5f8eff8 100644
--- a/keyboards/afternoonlabs/southern_breeze/rev1/config.h
+++ b/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
diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json
index 33ff4b27f4..1adb38445d 100644
--- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json
+++ b/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": {
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/config.h b/keyboards/afternoonlabs/summer_breeze/rev1/config.h
index 5f23201e6a..3ce5f8eff8 100644
--- a/keyboards/afternoonlabs/summer_breeze/rev1/config.h
+++ b/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
diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json
index 0b80bb9ac2..d2fcdd740a 100644
--- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json
+++ b/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": {
diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h
index e57f2640dc..73e163703a 100644
--- a/keyboards/alps64/config.h
+++ b/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.
diff --git a/keyboards/alps64/info.json b/keyboards/alps64/info.json
index 6c8a51fc27..ee1ad7d486 100644
--- a/keyboards/alps64/info.json
+++ b/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"],
diff --git a/keyboards/ares/config.h b/keyboards/ares/config.h
index dcf7d9eaa5..8d2ccd9278 100644
--- a/keyboards/ares/config.h
+++ b/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
diff --git a/keyboards/ares/info.json b/keyboards/ares/info.json
index 4be38bd497..5deca5390e 100644
--- a/keyboards/ares/info.json
+++ b/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": {
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/config.h b/keyboards/argo_works/ishi/80/mk0_avr/config.h
deleted file mode 100644
index c51e5b8f9b..0000000000
--- a/keyboards/argo_works/ishi/80/mk0_avr/config.h
+++ /dev/null
@@ -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
-\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/info.json b/keyboards/argo_works/ishi/80/mk0_avr/info.json
index f685d6a20a..4bc73f02ce 100644
--- a/keyboards/argo_works/ishi/80/mk0_avr/info.json
+++ b/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,
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h b/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h
deleted file mode 100644
index fea5aaf7ec..0000000000
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h
+++ /dev/null
@@ -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
-\ No newline at end of file
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json b/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json
index e96b2fd497..14662ad4ef 100644
--- a/keyboards/argo_works/ishi/80/mk0_avr_extra/info.json
+++ b/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,
diff --git a/keyboards/ashpil/modelm_usbc/config.h b/keyboards/ashpil/modelm_usbc/config.h
index 0209f8618a..97c826900c 100644
--- a/keyboards/ashpil/modelm_usbc/config.h
+++ b/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
diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/ashpil/modelm_usbc/info.json
index 7a378871c7..c048dd047a 100644
--- a/keyboards/ashpil/modelm_usbc/info.json
+++ b/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": {
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index cff93a705f..9c0fe39dbe 100644
--- a/keyboards/aves60/config.h
+++ b/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
diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json
index 4a5f26325a..71420c4423 100644
--- a/keyboards/aves60/info.json
+++ b/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": {
diff --git a/keyboards/basekeys/trifecta/config.h b/keyboards/basekeys/trifecta/config.h
index f009d3280c..71504c7b3a 100644
--- a/keyboards/basekeys/trifecta/config.h
+++ b/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)
diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json
index fa3ceb4067..6d7cf723a8 100644
--- a/keyboards/basekeys/trifecta/info.json
+++ b/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": {
diff --git a/keyboards/beekeeb/piantor/config.h b/keyboards/beekeeb/piantor/config.h
index 6a50429c20..e6ba4c0be9 100644
--- a/keyboards/beekeeb/piantor/config.h
+++ b/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
diff --git a/keyboards/beekeeb/piantor/info.json b/keyboards/beekeeb/piantor/info.json
index a914b1882d..5d4fcf1ae8 100644
--- a/keyboards/beekeeb/piantor/info.json
+++ b/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"],
diff --git a/keyboards/cantor/config.h b/keyboards/cantor/config.h
index 1cb680ac41..0b65007c13 100644
--- a/keyboards/cantor/config.h
+++ b/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.
diff --git a/keyboards/cantor/info.json b/keyboards/cantor/info.json
index b2067508a0..8358a60bd8 100644
--- a/keyboards/cantor/info.json
+++ b/keyboards/cantor/info.json
@@ -28,6 +28,9 @@
        ]
    },
    "split": {
+        "bootmagic": {
+            "matrix": [4, 5]
+        },
        "matrix_pins": {
            "right": {
                "direct": [
diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h
index ad01588e55..0a4d8c84b7 100644
--- a/keyboards/controllerworks/mini42/config.h
+++ b/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
diff --git a/keyboards/cradio/config.h b/keyboards/cradio/config.h
deleted file mode 100644
index e4ecd29539..0000000000
--- a/keyboards/cradio/config.h
+++ /dev/null
@@ -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
diff --git a/keyboards/cradio/info.json b/keyboards/cradio/info.json
index b88c37a881..e5e43b55b6 100644
--- a/keyboards/cradio/info.json
+++ b/keyboards/cradio/info.json
@@ -29,6 +29,9 @@
        ]
    },
    "split": {
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
        "enabled": true,
        "matrix_pins": {
            "right": {
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 4be20d7cb0..ab233a7c59 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/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
diff --git a/keyboards/delikeeb/waaffle/rev3/info.json b/keyboards/delikeeb/waaffle/rev3/info.json
index 709ceb1844..735a5cf16a 100644
--- a/keyboards/delikeeb/waaffle/rev3/info.json
+++ b/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":
diff --git a/keyboards/doodboard/duckboard_r2/config.h b/keyboards/doodboard/duckboard_r2/config.h
index 7a39ce1f59..21633b8a76 100644
--- a/keyboards/doodboard/duckboard_r2/config.h
+++ b/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
diff --git a/keyboards/doodboard/duckboard_r2/info.json b/keyboards/doodboard/duckboard_r2/info.json
index 8146af8bac..6483a4b129 100644
--- a/keyboards/doodboard/duckboard_r2/info.json
+++ b/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": {
diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h
index 7d53e1775a..9c1b4dddc7 100644
--- a/keyboards/doppelganger/config.h
+++ b/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
diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json
index 7c513539da..5ec220fe83 100644
--- a/keyboards/doppelganger/info.json
+++ b/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": {
diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h
index 7feddfd575..a8834cb0b9 100644
--- a/keyboards/duck/eagle_viper/v2/config.h
+++ b/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
diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/info.json
index c4d9ffa869..614e75c4c9 100644
--- a/keyboards/duck/eagle_viper/v2/info.json
+++ b/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": {
diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h
index 5a1562f4a4..874997ab56 100644
--- a/keyboards/duck/jetfire/config.h
+++ b/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.
diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/info.json
index ae158863a0..3fc7b030ed 100644
--- a/keyboards/duck/jetfire/info.json
+++ b/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": {
diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h
index 88cd81f7d3..1fa9980c8c 100644
--- a/keyboards/duck/lightsaver/config.h
+++ b/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
diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json
index 9067ca8f60..3f434820be 100644
--- a/keyboards/duck/lightsaver/info.json
+++ b/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": {
diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h
index fe44ef5126..c19aa1f22d 100644
--- a/keyboards/duck/octagon/v1/config.h
+++ b/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
diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/info.json
index c8208f0697..8eaf8fb0d9 100644
--- a/keyboards/duck/octagon/v1/info.json
+++ b/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"],
diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h
index 12f8bf1f0c..d1f2971077 100644
--- a/keyboards/duck/octagon/v2/config.h
+++ b/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
diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/info.json
index 95f8886a38..220196e9fc 100644
--- a/keyboards/duck/octagon/v2/info.json
+++ b/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"],
diff --git a/keyboards/duck/orion/v3/config.h b/keyboards/duck/orion/v3/config.h
index 1a13f8d7f6..908bad5bde 100644
--- a/keyboards/duck/orion/v3/config.h
+++ b/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
diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/info.json
index 576c4945e5..f96e5b9ca5 100644
--- a/keyboards/duck/orion/v3/info.json
+++ b/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"],
diff --git a/keyboards/duck/tcv3/config.h b/keyboards/duck/tcv3/config.h
index e7f8fb9346..4cb83d43fa 100644
--- a/keyboards/duck/tcv3/config.h
+++ b/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
diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/info.json
index 8cb7bfa08e..9b8b20e80e 100644
--- a/keyboards/duck/tcv3/info.json
+++ b/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": {
diff --git a/keyboards/dumbpad/v0x/config.h b/keyboards/dumbpad/v0x/config.h
index ac2a5a229e..8d0076cf02 100644
--- a/keyboards/dumbpad/v0x/config.h
+++ b/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
diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json
index 676860caae..160b696fe2 100644
--- a/keyboards/dumbpad/v0x/info.json
+++ b/keyboards/dumbpad/v0x/info.json
@@ -2,6 +2,9 @@
    "usb": {
        "device_version": "0.0.7"
    },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/dumbpad/v0x_dualencoder/config.h b/keyboards/dumbpad/v0x_dualencoder/config.h
index 2d675139ab..f3259fcbfd 100644
--- a/keyboards/dumbpad/v0x_dualencoder/config.h
+++ b/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
diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json
index d5fc6d6948..a12eecb8dc 100644
--- a/keyboards/dumbpad/v0x_dualencoder/info.json
+++ b/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": {
diff --git a/keyboards/dumbpad/v0x_right/config.h b/keyboards/dumbpad/v0x_right/config.h
index 76f78eff64..2b521a3266 100644
--- a/keyboards/dumbpad/v0x_right/config.h
+++ b/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
diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json
index d5589ddbd6..dc01df1c32 100644
--- a/keyboards/dumbpad/v0x_right/info.json
+++ b/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": {
diff --git a/keyboards/dumbpad/v1x/config.h b/keyboards/dumbpad/v1x/config.h
index 35dcbe79a9..6fcb41cff3 100644
--- a/keyboards/dumbpad/v1x/config.h
+++ b/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
diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json
index ae6734b006..f7da467561 100644
--- a/keyboards/dumbpad/v1x/info.json
+++ b/keyboards/dumbpad/v1x/info.json
@@ -2,6 +2,9 @@
    "usb": {
        "device_version": "0.1.0"
    },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/dumbpad/v1x_dualencoder/config.h b/keyboards/dumbpad/v1x_dualencoder/config.h
index d6c2993db2..4ee185ec8d 100644
--- a/keyboards/dumbpad/v1x_dualencoder/config.h
+++ b/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
diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json
index ae6734b006..f7da467561 100644
--- a/keyboards/dumbpad/v1x_dualencoder/info.json
+++ b/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": {
diff --git a/keyboards/dumbpad/v1x_right/config.h b/keyboards/dumbpad/v1x_right/config.h
index e4b947932d..391d8a8e53 100644
--- a/keyboards/dumbpad/v1x_right/config.h
+++ b/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
diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json
index 1f7eee9a16..db02b1aead 100644
--- a/keyboards/dumbpad/v1x_right/info.json
+++ b/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": {
diff --git a/keyboards/dumbpad/v3x/config.h b/keyboards/dumbpad/v3x/config.h
index d689863cf7..de058775b6 100644
--- a/keyboards/dumbpad/v3x/config.h
+++ b/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
diff --git a/keyboards/dumbpad/v3x/info.json b/keyboards/dumbpad/v3x/info.json
index 5aaf2a9564..31f44f74fe 100644
--- a/keyboards/dumbpad/v3x/info.json
+++ b/keyboards/dumbpad/v3x/info.json
@@ -5,6 +5,9 @@
    "usb": {
        "device_version": "0.1.0"
    },
+    "bootmagic": {
+        "matrix": [3, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index ac5b8001f7..f04585fdf4 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/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
diff --git a/keyboards/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json
index d0aa3728d2..4ca85c261e 100644
--- a/keyboards/eternal_keypad/info.json
+++ b/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": {
diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h
index 4115accaf3..aac834fbf8 100644
--- a/keyboards/evyd13/quackfire/config.h
+++ b/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
diff --git a/keyboards/evyd13/quackfire/info.json b/keyboards/evyd13/quackfire/info.json
index 3e8a4124c9..00741b0aae 100644
--- a/keyboards/evyd13/quackfire/info.json
+++ b/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"],
diff --git a/keyboards/evyd13/wasdat/config.h b/keyboards/evyd13/wasdat/config.h
index f519dbffd3..225005fea3 100644
--- a/keyboards/evyd13/wasdat/config.h
+++ b/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
diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/info.json
index 6e4c6e0749..f989107a84 100644
--- a/keyboards/evyd13/wasdat/info.json
+++ b/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",
diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h
index 21c4435df4..ea58609de1 100644
--- a/keyboards/evyd13/wasdat_code/config.h
+++ b/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
diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/info.json
index 3eddd79adc..2d27a79f30 100644
--- a/keyboards/evyd13/wasdat_code/info.json
+++ b/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"],
diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h
index d59c8bb414..51638e85ef 100644
--- a/keyboards/ferris/sweep/config.h
+++ b/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
diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/info.json
index 7174eb52b4..fe66cf8f96 100644
--- a/keyboards/ferris/sweep/info.json
+++ b/keyboards/ferris/sweep/info.json
@@ -17,6 +17,9 @@
        ]
    },
    "split": {
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
        "matrix_pins": {
            "right": {
                "direct": [
diff --git a/keyboards/frooastboard/nano/config.h b/keyboards/frooastboard/nano/config.h
index 3e031c9cbc..19378deacf 100644
--- a/keyboards/frooastboard/nano/config.h
+++ b/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
diff --git a/keyboards/frooastboard/nano/info.json b/keyboards/frooastboard/nano/info.json
index edd23d8556..fae1349a65 100644
--- a/keyboards/frooastboard/nano/info.json
+++ b/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"
 }
diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h
index 485ae37618..2eda942c15 100644
--- a/keyboards/gboards/gergo/config.h
+++ b/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
diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json
index e1ab1d5202..f38051809d 100644
--- a/keyboards/gboards/gergo/info.json
+++ b/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": {
diff --git a/keyboards/gl516/xr63gl/config.h b/keyboards/gl516/xr63gl/config.h
index 302f68620d..928fde7d86 100644
--- a/keyboards/gl516/xr63gl/config.h
+++ b/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
diff --git a/keyboards/gl516/xr63gl/info.json b/keyboards/gl516/xr63gl/info.json
index 7c6229a903..746f137807 100644
--- a/keyboards/gl516/xr63gl/info.json
+++ b/keyboards/gl516/xr63gl/info.json
@@ -23,6 +23,9 @@
        "pid": "0x0001",
        "vid": "0x8686"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "layouts": {
        "LAYOUT_63_ansi": {
            "layout": [
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json
index f8d8f19245..76e6e89925 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/info.json
+++ b/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": {
diff --git a/keyboards/gmmk/gmmk2/p65/config.h b/keyboards/gmmk/gmmk2/p65/config.h
index 33403a2ded..68eebabe73 100644
--- a/keyboards/gmmk/gmmk2/p65/config.h
+++ b/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 */
diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json
index 29dc2955be..5d5aba914e 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/info.json
+++ b/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": {
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index f13ecfc09f..912c59b715 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/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 }
diff --git a/keyboards/gmmk/pro/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
index 49830909bc..58636b462b 100644
--- a/keyboards/gmmk/pro/rev1/ansi/info.json
+++ b/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": {
diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 2a57848465..dce316167a 100644
--- a/keyboards/gmmk/pro/rev1/iso/info.json
+++ b/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": {
diff --git a/keyboards/gmmk/pro/rev2/ansi/info.json b/keyboards/gmmk/pro/rev2/ansi/info.json
index 11882e8af0..37b2e4b1cc 100644
--- a/keyboards/gmmk/pro/rev2/ansi/info.json
+++ b/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": {
diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json
index 4ffe92e4d8..10eaa5474b 100644
--- a/keyboards/gmmk/pro/rev2/iso/info.json
+++ b/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": {
diff --git a/keyboards/gon/nerd60/config.h b/keyboards/gon/nerd60/config.h
index 0423039882..d110f3d765 100644
--- a/keyboards/gon/nerd60/config.h
+++ b/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
diff --git a/keyboards/gon/nerd60/info.json b/keyboards/gon/nerd60/info.json
index 6d83a2336e..1bd845764e 100644
--- a/keyboards/gon/nerd60/info.json
+++ b/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"],
diff --git a/keyboards/gon/nerdtkl/config.h b/keyboards/gon/nerdtkl/config.h
index 97bbd8c7b4..ff5376d033 100644
--- a/keyboards/gon/nerdtkl/config.h
+++ b/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
diff --git a/keyboards/gon/nerdtkl/info.json b/keyboards/gon/nerdtkl/info.json
index 21c1e0775f..2381b25d7c 100644
--- a/keyboards/gon/nerdtkl/info.json
+++ b/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": {
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index 4997ae12dd..a9ddcc3315 100644
--- a/keyboards/handwired/brain/config.h
+++ b/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
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
index 7b9260f2d2..c7f91a294b 100644
--- a/keyboards/handwired/brain/info.json
+++ b/keyboards/handwired/brain/info.json
@@ -8,6 +8,14 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 6]
+    },
+    "split": {
+        "bootmagic": {
+            "matrix": [5, 0]
+        }
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h
index a6840170ae..a6b36d163c 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h
@@ -32,12 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-#define BOOTMAGIC_LITE_ROW_RIGHT 6
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
 // WS2812 RGB LED strip input and number of LEDs
 // #define RGB_DI_PIN D3
 // #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
index 9ca8136ede..12b8c20c5a 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
@@ -8,6 +8,11 @@
        "pid": "0x3536",
        "device_version": "0.0.3"
    },
+    "split": {
+        "bootmagic": {
+            "matrix": [6, 5]
+        }
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/config.h
index eacb178e46..cc21709a9c 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/config.h
@@ -30,12 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-#define BOOTMAGIC_LITE_ROW_RIGHT 6
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
 // WS2812 RGB LED strip input and number of LEDs
 // #define RGB_DI_PIN D3
 // #define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
index c99a1cd8ff..b8fda10021 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
@@ -8,6 +8,11 @@
        "pid": "0x3536",
        "device_version": "0.0.2"
    },
+    "split": {
+        "bootmagic": {
+            "matrix": [6, 5]
+        }
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
index 99a36c5905..717e0e98f0 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
@@ -24,11 +24,6 @@
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define BOOTMAGIC_LITE_ROW          0
-#define BOOTMAGIC_LITE_COLUMN       0
-#define BOOTMAGIC_LITE_ROW_RIGHT    7
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
 // in col2row col is input, and row is output
 // #define SPLIT_HAND_MATRIX_GRID A10, A4
 // 68kohm
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
index 2517a82403..f28579ba5f 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
@@ -1,4 +1,9 @@
 {
+    "split": {
+        "bootmagic": {
+            "matrix": [7, 0]
+        }
+    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu",
    "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/config.h b/keyboards/handwired/daskeyboard/daskeyboard4/config.h
deleted file mode 100644
index df121b6832..0000000000
--- a/keyboards/handwired/daskeyboard/daskeyboard4/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 Commander1024 (@Commander1024)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-/* configure bootmagic lite trigger to ESC */
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 16
-/*
- * 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
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/info.json b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
index a61443000d..067450ae0b 100644
--- a/keyboards/handwired/daskeyboard/daskeyboard4/info.json
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/info.json
@@ -26,6 +26,9 @@
        "vid": "0xFEED",
        "pid": "0x0140"
    },
+    "bootmagic": {
+        "matrix": [5, 16]
+    },
    "indicators": {
        "num_lock": "C13",
        "caps_lock": "B14",
diff --git a/keyboards/handwired/dc/mc/001/config.h b/keyboards/handwired/dc/mc/001/config.h
index ecc1bc9c52..7be4ba0aa9 100644
--- a/keyboards/handwired/dc/mc/001/config.h
+++ b/keyboards/handwired/dc/mc/001/config.h
@@ -43,10 +43,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 */
-// The (default) Stop key
-// Doesn't work, though. Maybe becuase of the bootloader that's in use?
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/info.json
index 2bcd5ffd92..d14c92150b 100644
--- a/keyboards/handwired/dc/mc/001/info.json
+++ b/keyboards/handwired/dc/mc/001/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4D43",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "matrix_pins": {
diff --git a/keyboards/handwired/frankie_macropad/config.h b/keyboards/handwired/frankie_macropad/config.h
index f4ba32d5a6..6d0aa48c7c 100644
--- a/keyboards/handwired/frankie_macropad/config.h
+++ b/keyboards/handwired/frankie_macropad/config.h
@@ -60,9 +60,5 @@ 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 0
 #define ENCODERS_PAD_A { D0, D2 }
 #define ENCODERS_PAD_B { D1, D3 }
diff --git a/keyboards/handwired/frankie_macropad/info.json b/keyboards/handwired/frankie_macropad/info.json
index f206c366a5..3ddf407549 100644
--- a/keyboards/handwired/frankie_macropad/info.json
+++ b/keyboards/handwired/frankie_macropad/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [2, 0]
+    },
    "processor": "atmega16u2",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/handwired/jscotto/scottocmd/config.h b/keyboards/handwired/jscotto/scottocmd/config.h
index db72806f86..a168f0ef21 100644
--- a/keyboards/handwired/jscotto/scottocmd/config.h
+++ b/keyboards/handwired/jscotto/scottocmd/config.h
@@ -17,9 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-// Define tab key for boot magic
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
 // OLED 
 #define OLED_DISPLAY_128X64
 \ No newline at end of file
diff --git a/keyboards/handwired/jscotto/scottocmd/info.json b/keyboards/handwired/jscotto/scottocmd/info.json
index b2040fb7ab..51bf76595d 100644
--- a/keyboards/handwired/jscotto/scottocmd/info.json
+++ b/keyboards/handwired/jscotto/scottocmd/info.json
@@ -38,6 +38,9 @@
        "pid": "0x0000",
        "vid": "0xFEED"
    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
    "layouts": {
        "LAYOUT_ortho_4_3x10_4": {
            "layout": [
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
index a861c59889..9bdb4f268e 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
@@ -47,12 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ROTATIONAL_TRANSFORM_ANGLE     -25
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW             0
-#define BOOTMAGIC_LITE_COLUMN          0
-#define BOOTMAGIC_LITE_ROW_RIGHT       4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT    5
 #define AUDIO_PIN                      C6
 #define AUDIO_PIN_ALT                  B7
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
index 9ea6febd4a..1880e66b8d 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json
@@ -6,6 +6,11 @@
        "pid": "0x3537",
        "device_version": "0.0.1"
    },
+    "split": {
+        "bootmagic": {
+            "matrix": [4, 5]
+        }
+    },
    "processor": "at90usb1286",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
index 237ff5ec76..d89cf6f2b4 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
@@ -29,12 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ROTATIONAL_TRANSFORM_ANGLE  -25
 #define POINTING_DEVICE_INVERT_X
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW          0
-#define BOOTMAGIC_LITE_COLUMN       0
-#define BOOTMAGIC_LITE_ROW_RIGHT    6
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
 #define DYNAMIC_KEYMAP_LAYER_COUNT  16
 #define LAYER_STATE_16BIT
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
index 5000486242..1ea3e6ab8b 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
@@ -4,6 +4,11 @@
        "pid": "0x3536",
        "device_version": "0.0.1"
    },
+    "split": {
+        "bootmagic": {
+            "matrix": [6, 5]
+        }
+    },
    "layouts": {
        "LAYOUT_5x6_right": {
            "layout": [
diff --git a/keyboards/handwired/videowriter/config.h b/keyboards/handwired/videowriter/config.h
index 12961d531f..aa498a7e4a 100644
--- a/keyboards/handwired/videowriter/config.h
+++ b/keyboards/handwired/videowriter/config.h
@@ -42,7 +42,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 7
diff --git a/keyboards/handwired/videowriter/info.json b/keyboards/handwired/videowriter/info.json
index 59ea1c0613..329085fe85 100644
--- a/keyboards/handwired/videowriter/info.json
+++ b/keyboards/handwired/videowriter/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5657",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 7]
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/hhkb_lite_2/config.h b/keyboards/hhkb_lite_2/config.h
index ec70477d30..c7395b7342 100644
--- a/keyboards/hhkb_lite_2/config.h
+++ b/keyboards/hhkb_lite_2/config.h
@@ -11,7 +11,3 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Bootmagic keys are non-standard because of matrix */
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 9
diff --git a/keyboards/hhkb_lite_2/info.json b/keyboards/hhkb_lite_2/info.json
index 078cd1a5c1..1051663c30 100644
--- a/keyboards/hhkb_lite_2/info.json
+++ b/keyboards/hhkb_lite_2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x88B2",
        "device_version": "0.0.2"
    },
+    "bootmagic": {
+        "matrix": [5, 9]
+    },
    "processor": "atmega32u4",
    "bootloader": "halfkay",
    "layouts": {
diff --git a/keyboards/horrortroll/paws60/config.h b/keyboards/horrortroll/paws60/config.h
index 4628d588b8..b1d1122ee2 100644
--- a/keyboards/horrortroll/paws60/config.h
+++ b/keyboards/horrortroll/paws60/config.h
@@ -25,9 +25,6 @@
 #define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
 #define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 6
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/horrortroll/paws60/info.json b/keyboards/horrortroll/paws60/info.json
index 475172ffc0..f9b81dfc96 100644
--- a/keyboards/horrortroll/paws60/info.json
+++ b/keyboards/horrortroll/paws60/info.json
@@ -8,6 +8,9 @@
        "pid": "0x6060",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [3, 6]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi_split_bs_rshift", "60_ansi", "60_ansi_tsangan", "60_tsangan_hhkb"],
diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h
index aab270a164..edb3fc8a3f 100644
--- a/keyboards/idobao/id80/v2/config.h
+++ b/keyboards/idobao/id80/v2/config.h
@@ -81,7 +81,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    #define RGBLIGHT_EFFECT_STATIC_GRADIENT
    #define RGBLIGHT_EFFECT_TWINKLE
 #endif
-/* Bootmagic Lite key configuration: use the Esc key */
-#define BOOTMAGIC_LITE_ROW      0
-#define BOOTMAGIC_LITE_COLUMN   5
diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json
index 5d874014a6..770242c95d 100644
--- a/keyboards/idobao/id80/v2/info.json
+++ b/keyboards/idobao/id80/v2/info.json
@@ -6,6 +6,9 @@
        "vid": "0x6964",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "features": {
diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h
index 9518a5a7f8..bdabde0782 100644
--- a/keyboards/idobao/id80/v3/ansi/config.h
+++ b/keyboards/idobao/id80/v3/ansi/config.h
@@ -3,15 +3,6 @@
 #pragma once
-/* --------------------------------
- * Bootmagic Lite key configuration
- * use the Esc key
- * -------------------------------- */
-#define BOOTMAGIC_LITE_ROW      0
-#define BOOTMAGIC_LITE_COLUMN   5
 /* ----------------
 * RGB Matrix stuff
 * ---------------- */
diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
index fccff8efda..9797c60dfe 100644
--- a/keyboards/idobao/id80/v3/ansi/info.json
+++ b/keyboards/idobao/id80/v3/ansi/info.json
@@ -25,6 +25,9 @@
        "pid": "0x0380",
        "device_version": "3.0.0"
    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
    "layouts": {
        "LAYOUT_80_ansi": {
            "layout": [
diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h
index b1d73a1455..3d0baa4676 100644
--- a/keyboards/idobao/id96/config.h
+++ b/keyboards/idobao/id96/config.h
@@ -40,10 +40,6 @@
  #define BACKLIGHT_BREATHING
 #endif
-/* Set location for BootMagic key = [ESC] */
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json
index 52ccc7b956..e2bc4ea581 100644
--- a/keyboards/idobao/id96/info.json
+++ b/keyboards/idobao/id96/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0096",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [5, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h
index 8746825ea6..32fed95071 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h
@@ -35,10 +35,6 @@
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
 #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0, E6 }
-/* Setting the matrix value of top left key for bootmagic lite */
-#define BOOTMAGIC_LITE_ROW      0
-#define BOOTMAGIC_LITE_COLUMN   15
 #define DIODE_DIRECTION ROW2COL
 #define BACKLIGHT_PIN B6
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/info.json b/keyboards/jacky_studio/s7_elephant/rev2/info.json
index c7cc5aaf14..0b63a48b6a 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/info.json
+++ b/keyboards/jacky_studio/s7_elephant/rev2/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0008",
        "device_version": "0.0.2"
    },
+    "bootmagic": {
+        "matrix": [0, 15]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/jae/j01/config.h b/keyboards/jae/j01/config.h
index 649d08e072..5830ea181c 100644
--- a/keyboards/jae/j01/config.h
+++ b/keyboards/jae/j01/config.h
@@ -63,7 +63,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
diff --git a/keyboards/jae/j01/info.json b/keyboards/jae/j01/info.json
index e5617e0193..1f2b843d6f 100644
--- a/keyboards/jae/j01/info.json
+++ b/keyboards/jae/j01/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0143",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/jels/jels88/config.h b/keyboards/jels/jels88/config.h
index ee1ccd074d..49d85071eb 100644
--- a/keyboards/jels/jels88/config.h
+++ b/keyboards/jels/jels88/config.h
@@ -54,6 +54,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json
index e91331b66f..fed2fe9f4c 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0088",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/jkdlab/binary_monkey/config.h b/keyboards/jkdlab/binary_monkey/config.h
index 902a89eddc..427456a5a7 100644
--- a/keyboards/jkdlab/binary_monkey/config.h
+++ b/keyboards/jkdlab/binary_monkey/config.h
@@ -27,7 +27,3 @@
 #define DIODE_DIRECTION COL2ROW
 #define USB_MAX_POWER_CONSUMPTION 100
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 2
diff --git a/keyboards/jkdlab/binary_monkey/info.json b/keyboards/jkdlab/binary_monkey/info.json
index 10ef74c0aa..c5422097ab 100644
--- a/keyboards/jkdlab/binary_monkey/info.json
+++ b/keyboards/jkdlab/binary_monkey/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0101",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h
index a3382a0898..1dfd06f633 100644
--- a/keyboards/jones/v1/config.h
+++ b/keyboards/jones/v1/config.h
@@ -54,10 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
 #endif
-/* Bootmagic Lite trigger key. Left-Top of the layout. */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 9
 /* External EEPROM */
 // Use 24LC64 EEPROM
 #define EEPROM_I2C_24LC64
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json
index 8896600444..8e03e57950 100644
--- a/keyboards/jones/v1/info.json
+++ b/keyboards/jones/v1/info.json
@@ -8,6 +8,9 @@
    "pid": "0x175A",
    "device_version": "1.0.0"
  },
+  "bootmagic": {
+    "matrix": [0, 9]
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/kabedon/kabedon98e/config.h b/keyboards/kabedon/kabedon98e/config.h
index 1585918bc5..7986610abc 100644
--- a/keyboards/kabedon/kabedon98e/config.h
+++ b/keyboards/kabedon/kabedon98e/config.h
@@ -57,6 +57,3 @@
 #define ENCODERS_CCW_KEY { { 6, 0 },{ 8, 0 } }
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json
index c60ffa392e..1ec2ed9ac5 100644
--- a/keyboards/kabedon/kabedon98e/info.json
+++ b/keyboards/kabedon/kabedon98e/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3935",
        "device_version": "0.0.2"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "layouts": {
diff --git a/keyboards/kapcave/gskt00/config.h b/keyboards/kapcave/gskt00/config.h
index c38c0ed695..d4450037b1 100755
--- a/keyboards/kapcave/gskt00/config.h
+++ b/keyboards/kapcave/gskt00/config.h
@@ -25,9 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { F1, D1, D2, D4, D6, F7, B0, F4 }
 #define MATRIX_COL_PINS { F6, D7, F5, C7, B4, C6, B6, B5 }
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 6
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/kapcave/gskt00/info.json b/keyboards/kapcave/gskt00/info.json
index 3abf75460b..94b0159176 100644
--- a/keyboards/kapcave/gskt00/info.json
+++ b/keyboards/kapcave/gskt00/info.json
@@ -8,6 +8,9 @@
    "pid": "0x6061",
    "device_version": "0.0.1"
  },
+  "bootmagic": {
+    "matrix": [3, 6]
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["60_ansi_tsangan", "60_iso_tsangan"],
diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h
index 5f653e3225..bf8ee27070 100755
--- a/keyboards/kapcave/paladin64/config.h
+++ b/keyboards/kapcave/paladin64/config.h
@@ -21,9 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
-#define BOOTMAGIC_LITE_ROW 3
-#define BOOTMAGIC_LITE_COLUMN 6
 /* Only required if you add in a trackpoint hardware to the pcb */
 #ifdef PS2_DRIVER_USART
 #define PS2_CLOCK_PIN   D5
diff --git a/keyboards/kapcave/paladin64/info.json b/keyboards/kapcave/paladin64/info.json
index 3188395d52..f64fdc2a65 100644
--- a/keyboards/kapcave/paladin64/info.json
+++ b/keyboards/kapcave/paladin64/info.json
@@ -8,6 +8,9 @@
      "pid": "0x5036",
      "device_version": "0.0.1"
    },
+    "bootmagic": {
+      "matrix": [3, 6]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi"],
diff --git a/keyboards/kb_elmo/m0116_usb/config.h b/keyboards/kb_elmo/m0116_usb/config.h
index 2acbcb4fbe..055c302aaa 100644
--- a/keyboards/kb_elmo/m0116_usb/config.h
+++ b/keyboards/kb_elmo/m0116_usb/config.h
@@ -35,7 +35,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 4
-#define BOOTMAGIC_LITE_COLUMN 5
diff --git a/keyboards/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/info.json
index c22ec2912b..e01f965731 100644
--- a/keyboards/kb_elmo/m0116_usb/info.json
+++ b/keyboards/kb_elmo/m0116_usb/info.json
@@ -8,6 +8,9 @@
        "pid": "0x8F7E",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [4, 5]
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/kb_elmo/sesame/config.h b/keyboards/kb_elmo/sesame/config.h
index ef1faec1f8..e9a0f27d9a 100644
--- a/keyboards/kb_elmo/sesame/config.h
+++ b/keyboards/kb_elmo/sesame/config.h
@@ -31,9 +31,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
 /* Workaround for https://github.com/qmk/qmk_firmware/issues/11389 */
 #define IGNORE_ATOMIC_BLOCK
diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/info.json
index 19aba72de8..18060301f6 100644
--- a/keyboards/kb_elmo/sesame/info.json
+++ b/keyboards/kb_elmo/sesame/info.json
@@ -8,6 +8,9 @@
    "pid": "0xE2BD",
    "device_version": "0.0.1"
  },
+  "bootmagic": {
+    "matrix": [0, 1]
+  },
  "processor": "atmega32a",
  "bootloader": "usbasploader",
  "community_layouts": ["alice", "alice_split_bs"],
diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h
index 6df9b56a5c..ec9dc32c47 100644
--- a/keyboards/keybage/radpad/config.h
+++ b/keyboards/keybage/radpad/config.h
@@ -48,10 +48,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #endif
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 3
 /* OLED Configuration */
 #ifdef OLED_ENABLE
    #define OLED_TIMEOUT            60000
diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json
index e6bc0d8370..c2d77fca50 100644
--- a/keyboards/keybage/radpad/info.json
+++ b/keyboards/keybage/radpad/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5250",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/keychron/q0/rev_0131/config.h b/keyboards/keychron/q0/rev_0131/config.h
index 4ed6f0e4e7..5a31fc4e77 100644
--- a/keyboards/keychron/q0/rev_0131/config.h
+++ b/keyboards/keychron/q0/rev_0131/config.h
@@ -39,7 +39,3 @@
 #define ENCODERS_PAD_B { A4 }
 #define ENCODER_RESOLUTION 4
 #define ENCODER_DEFAULT_POS 0x3
-/* Specify (0,1) which programmed as "Fn" key on this keyboard as bootmagic key */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/keychron/q0/rev_0131/info.json b/keyboards/keychron/q0/rev_0131/info.json
index 9fbbe7d206..ad555630f9 100644
--- a/keyboards/keychron/q0/rev_0131/info.json
+++ b/keyboards/keychron/q0/rev_0131/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0131",
        "device_version": "1.0.0"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json
index 0c8590c222..70de4d95be 100644
--- a/keyboards/keychron/q10/ansi_encoder/info.json
+++ b/keyboards/keychron/q10/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x01A1",
        "device_version": "1.0.0"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/q10/config.h b/keyboards/keychron/q10/config.h
index 507a00ebca..0ef4edf245 100644
--- a/keyboards/keychron/q10/config.h
+++ b/keyboards/keychron/q10/config.h
@@ -59,10 +59,6 @@
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-/* Specify (0,1) which programmed as "ESC" key on this keyboard as bootmagic key */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json
index 4b60bc9f76..f0b5b2704e 100644
--- a/keyboards/keychron/q10/iso_encoder/info.json
+++ b/keyboards/keychron/q10/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x01A3",
        "device_version": "1.0.0"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json
index dea29260d6..a7ec2d56b3 100644
--- a/keyboards/keychron/q65/ansi_encoder/info.json
+++ b/keyboards/keychron/q65/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x01B1",
        "device_version": "1.0.0"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/q65/config.h b/keyboards/keychron/q65/config.h
index e2fcb12282..148ea9ad14 100644
--- a/keyboards/keychron/q65/config.h
+++ b/keyboards/keychron/q65/config.h
@@ -57,10 +57,6 @@
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-/* Specifed (0,1) which programmed as "ESC" key on this keyboard as bootmagic key */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/keychron/v10/ansi_encoder/info.json b/keyboards/keychron/v10/ansi_encoder/info.json
index 9507fe6d32..c3b78316d5 100644
--- a/keyboards/keychron/v10/ansi_encoder/info.json
+++ b/keyboards/keychron/v10/ansi_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x03A1",
        "device_version": "1.0.0"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/keychron/v10/config.h b/keyboards/keychron/v10/config.h
index aecdbcf850..9bc5d0f559 100644
--- a/keyboards/keychron/v10/config.h
+++ b/keyboards/keychron/v10/config.h
@@ -59,10 +59,6 @@
 #define WEAR_LEVELING_LOGICAL_SIZE 2048
 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
-/* Specify (0,1) which programmed as "ESC" key on this keyboard as bootmagic key */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
diff --git a/keyboards/keychron/v10/iso_encoder/info.json b/keyboards/keychron/v10/iso_encoder/info.json
index 5eb5c53789..ed48f6270a 100644
--- a/keyboards/keychron/v10/iso_encoder/info.json
+++ b/keyboards/keychron/v10/iso_encoder/info.json
@@ -8,6 +8,9 @@
        "pid": "0x03A3",
        "device_version": "1.0.0"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "STM32L432",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/kikoslab/ellora65/config.h b/keyboards/kikoslab/ellora65/config.h
index 96666999b7..50cade0a2d 100644
--- a/keyboards/kikoslab/ellora65/config.h
+++ b/keyboards/kikoslab/ellora65/config.h
@@ -36,7 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*RGB TINGS*/
 #define RGB_DI_PIN E6
 #define RGBLED_NUM 12
-/* bootmagic row col assignment */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json
index 1f32b9af2f..e143889119 100644
--- a/keyboards/kikoslab/ellora65/info.json
+++ b/keyboards/kikoslab/ellora65/info.json
@@ -8,6 +8,9 @@
        "pid": "0xE88F",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/knobgoblin/config.h b/keyboards/knobgoblin/config.h
index e57e9890b9..18c4ca03fc 100644
--- a/keyboards/knobgoblin/config.h
+++ b/keyboards/knobgoblin/config.h
@@ -32,7 +32,3 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/*Bootmagic position definition because (0,0) is not used*/
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/knobgoblin/info.json b/keyboards/knobgoblin/info.json
index c1515a24fa..d80aef2313 100644
--- a/keyboards/knobgoblin/info.json
+++ b/keyboards/knobgoblin/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0000",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "debounce": 2,
diff --git a/keyboards/ktec/staryu/config.h b/keyboards/ktec/staryu/config.h
index d2fb24f35d..e8e726364c 100755
--- a/keyboards/ktec/staryu/config.h
+++ b/keyboards/ktec/staryu/config.h
@@ -35,7 +35,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PINS { C2, C7, D5, D6, B0 }
 #define BACKLIGHT_LED_COUNT 5
 #define BACKLIGHT_LEVELS 10
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/ktec/staryu/info.json b/keyboards/ktec/staryu/info.json
index e222923a23..b366c60315 100644
--- a/keyboards/ktec/staryu/info.json
+++ b/keyboards/ktec/staryu/info.json
@@ -8,6 +8,9 @@
        "pid": "0x2328",
        "device_version": "2.0.5"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "atmega32u2",
    "bootloader": "lufa-dfu",
    "matrix_pins": {
diff --git a/keyboards/labyrinth75/config.h b/keyboards/labyrinth75/config.h
index c5cf081aac..09e45e5bf7 100644
--- a/keyboards/labyrinth75/config.h
+++ b/keyboards/labyrinth75/config.h
@@ -76,7 +76,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
diff --git a/keyboards/labyrinth75/info.json b/keyboards/labyrinth75/info.json
index a01a1a26fa..67ad33b84e 100644
--- a/keyboards/labyrinth75/info.json
+++ b/keyboards/labyrinth75/info.json
@@ -8,6 +8,9 @@
        "pid": "0x464B",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/linworks/em8/config.h b/keyboards/linworks/em8/config.h
deleted file mode 100644
index 176c814e35..0000000000
--- a/keyboards/linworks/em8/config.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2022 moritz plattner (@moritz plattner)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-// Move Bootmagic key from ~ to ESC (0,0 to 1,0)
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/linworks/em8/info.json b/keyboards/linworks/em8/info.json
index 2743270970..4abcb323a4 100644
--- a/keyboards/linworks/em8/info.json
+++ b/keyboards/linworks/em8/info.json
@@ -23,6 +23,9 @@
        "pid": "0x0006",
        "vid": "0x4C58"
    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
    "indicators": {
        "num_lock": "D2",
        "caps_lock": "D3",
diff --git a/keyboards/ll3macorn/bongopad/config.h b/keyboards/ll3macorn/bongopad/config.h
index 1ed1c001dd..f0a6e7660b 100644
--- a/keyboards/ll3macorn/bongopad/config.h
+++ b/keyboards/ll3macorn/bongopad/config.h
@@ -2,11 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
-/* bootmagic */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
 /* rgb underglow */
 #define RGB_DI_PIN E6
 #define RGBLED_NUM 6
diff --git a/keyboards/ll3macorn/bongopad/info.json b/keyboards/ll3macorn/bongopad/info.json
index 2b79851bdc..faed6f473c 100644
--- a/keyboards/ll3macorn/bongopad/info.json
+++ b/keyboards/ll3macorn/bongopad/info.json
@@ -8,6 +8,9 @@
                "pid": "0x2949",
                "device_version": "0.0.1"
        },
+        "bootmagic": {
+                "matrix": [1, 0]
+        },
        "processor": "atmega32u4",
        "bootloader": "atmel-dfu",
        "layouts": {
diff --git a/keyboards/makrosu/config.h b/keyboards/makrosu/config.h
index 4a0033d1b9..941d287300 100644
--- a/keyboards/makrosu/config.h
+++ b/keyboards/makrosu/config.h
@@ -31,9 +31,6 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 5
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/makrosu/info.json b/keyboards/makrosu/info.json
index 98b59ca236..9474d6c804 100644
--- a/keyboards/makrosu/info.json
+++ b/keyboards/makrosu/info.json
@@ -8,6 +8,9 @@
        "pid": "0x8585",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/mechlovin/hex4b/config.h b/keyboards/mechlovin/hex4b/config.h
index 0724ec4bb4..97e768fa61 100644
--- a/keyboards/mechlovin/hex4b/config.h
+++ b/keyboards/mechlovin/hex4b/config.h
@@ -37,7 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define LED_PIN_ON_STATE 0
-/* Bootmagic Lite key configuration, Backspace */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 14
diff --git a/keyboards/mechlovin/hex4b/info.json b/keyboards/mechlovin/hex4b/info.json
index 2edd39b3e2..3cc4645584 100644
--- a/keyboards/mechlovin/hex4b/info.json
+++ b/keyboards/mechlovin/hex4b/info.json
@@ -6,6 +6,9 @@
        "vid": "0x4D4C",
        "pid": "0x0675"
    },
+    "bootmagic": {
+        "matrix": [1, 14]
+    },
    "layout_aliases": {
        "LAYOUT": "LAYOUT_split_bs",
        "LAYOUT_all": "LAYOUT_split_bs"
diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h
index 61211d6bdf..c4e588e678 100644
--- a/keyboards/mechlovin/hex4b/rev1/config.h
+++ b/keyboards/mechlovin/hex4b/rev1/config.h
@@ -41,7 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 5
 #define BACKLIGHT_BREATHING
-/* Bootmagic Lite key configuration, Backspace */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 14
diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h
index 7a055b4ff7..db994638c8 100644
--- a/keyboards/mechlovin/hex4b/rev2/config.h
+++ b/keyboards/mechlovin/hex4b/rev2/config.h
@@ -42,7 +42,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 5
 #define BACKLIGHT_PWM_DRIVER PWMD4
 #define BACKLIGHT_BREATHING
-/* Bootmagic Lite key configuration, Backspace */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 14
-\ No newline at end of file
diff --git a/keyboards/mechlovin/mechlovin9/rev2/config.h b/keyboards/mechlovin/mechlovin9/rev2/config.h
index c06295dfde..2fedbcaa0d 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/config.h
+++ b/keyboards/mechlovin/mechlovin9/rev2/config.h
@@ -34,7 +34,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_BREATHING
-/* Bootmagic Lite key configuration */
- #define BOOTMAGIC_LITE_ROW 0
- #define BOOTMAGIC_LITE_COLUMN 13
diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/info.json
index bada93cca4..34d878de82 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev2/info.json
@@ -4,6 +4,9 @@
        "pid": "0x6509",
        "device_version": "0.0.2"
    },
+    "bootmagic": {
+        "matrix": [0, 13]
+    },
    "processor": "atmega32a",
    "bootloader": "bootloadhid"
 }
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h
index ac72d67c72..b0f8318b8e 100644
--- a/keyboards/mechlovin/olly/jf/config.h
+++ b/keyboards/mechlovin/olly/jf/config.h
@@ -60,7 +60,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 1
-#define BOOTMAGIC_LITE_COLUMN 14
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index 4496f5c92a..7b353ee3d8 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -8,6 +8,9 @@
        "pid": "0xD180",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 14]
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index 3770b924fd..ffdd985751 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -64,7 +64,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json
index 6344d42672..57a3c8fa8d 100644
--- a/keyboards/mechwild/murphpad/info.json
+++ b/keyboards/mechwild/murphpad/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1705",
        "device_version": "3.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index b3e4308e20..d3117e1853 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -91,7 +91,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 5
-#define BOOTMAGIC_LITE_COLUMN 4
diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index fbae09e15c..c9dc4add4d 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1707",
        "device_version": "2.0.1"
    },
+    "bootmagic": {
+        "matrix": [5, 4]
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
index 89266fd0b8..5e376563fc 100644
--- a/keyboards/mlego/m60_split/rev1/config.h
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -70,10 +70,4 @@
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-#define BOOTMAGIC_LITE_ROW_RIGHT 5
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
 #endif
diff --git a/keyboards/mlego/m60_split/rev1/info.json b/keyboards/mlego/m60_split/rev1/info.json
index b1cfbd3d4b..e306bb804f 100644
--- a/keyboards/mlego/m60_split/rev1/info.json
+++ b/keyboards/mlego/m60_split/rev1/info.json
@@ -3,6 +3,11 @@
        "pid": "0x6361",
        "device_version": "0.0.1"
    },
+    "split": {
+        "bootmagic": {
+            "matrix": [5, 0]
+        }
+    },
    "processor": "STM32F401",
    "bootloader": "tinyuf2",
    "board": "BLACKPILL_STM32_F401"
diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h
index 9d0fdc7351..524bb9daa1 100644
--- a/keyboards/mlego/m60_split/rev2/config.h
+++ b/keyboards/mlego/m60_split/rev2/config.h
@@ -69,10 +69,3 @@
 #define RGBLIGHT_EFFECT_ALTERNATING
 #define RGBLIGHT_EFFECT_TWINKLE
 #endif
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-#define BOOTMAGIC_LITE_ROW_RIGHT 5
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
diff --git a/keyboards/mlego/m60_split/rev2/info.json b/keyboards/mlego/m60_split/rev2/info.json
index 936c6fbdad..f51c758847 100644
--- a/keyboards/mlego/m60_split/rev2/info.json
+++ b/keyboards/mlego/m60_split/rev2/info.json
@@ -3,6 +3,11 @@
        "pid": "0x6362",
        "device_version": "0.0.1"
    },
+    "split": {
+        "bootmagic": {
+            "matrix": [5, 0]
+        }
+    },
    "processor": "STM32F411",
    "bootloader": "stm32-dfu",
    "board": "BLACKPILL_STM32_F411"
diff --git a/keyboards/ms_sculpt/config.h b/keyboards/ms_sculpt/config.h
index 710fc756af..00ff6001f1 100644
--- a/keyboards/ms_sculpt/config.h
+++ b/keyboards/ms_sculpt/config.h
@@ -3,14 +3,6 @@
 #pragma once
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-#define BOOTMAGIC_LITE_ROW 4
-#define BOOTMAGIC_LITE_COLUMN 13
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 18
diff --git a/keyboards/ms_sculpt/info.json b/keyboards/ms_sculpt/info.json
index 4eaf4b0a75..23d5666a4d 100644
--- a/keyboards/ms_sculpt/info.json
+++ b/keyboards/ms_sculpt/info.json
@@ -26,6 +26,9 @@
        "pid": "0x0000",
        "vid": "0xFEED"
    },
+    "bootmagic": {
+        "matrix": [4, 13]
+    },
    "layouts": {
        "LAYOUT_iso": {
            "layout": [
diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h
index 5bde97f0b7..c4693ff3db 100644
--- a/keyboards/mt/mt980/config.h
+++ b/keyboards/mt/mt980/config.h
@@ -46,7 +46,3 @@
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_LIMIT_VAL 185
 #endif
-/* Place bootmagic key on Esc */
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json
index e5d005916b..4a29ee943d 100644
--- a/keyboards/mt/mt980/info.json
+++ b/keyboards/mt/mt980/info.json
@@ -8,6 +8,9 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "bootmagic": {
+    "matrix": [5, 0]
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h
index bea5848869..d6ee2da1b4 100644
--- a/keyboards/mwstudio/mw75/config.h
+++ b/keyboards/mwstudio/mw75/config.h
@@ -25,9 +25,6 @@
 #define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5, B0}
 #define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6 }
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json
index bfba17e818..bc4404203f 100644
--- a/keyboards/mwstudio/mw75/info.json
+++ b/keyboards/mwstudio/mw75/info.json
@@ -8,6 +8,9 @@
        "pid": "0x7501",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/nasu/config.h b/keyboards/nasu/config.h
index e9051bba30..9347e529c6 100644
--- a/keyboards/nasu/config.h
+++ b/keyboards/nasu/config.h
@@ -35,7 +35,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_CAPS_LOCK_PIN B1
 #define LED_NUM_LOCK_PIN B0
 #define LED_SCROLL_LOCK_PIN A7
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/nasu/info.json b/keyboards/nasu/info.json
index 9ac89dd1f0..72bc5f2fe2 100644
--- a/keyboards/nasu/info.json
+++ b/keyboards/nasu/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4E53",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "community_layouts": ["alice", "alice_split_bs"],
diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h
index 3e1e066cea..4d955a597d 100644
--- a/keyboards/nightmare/config.h
+++ b/keyboards/nightmare/config.h
@@ -58,7 +58,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
diff --git a/keyboards/nightmare/info.json b/keyboards/nightmare/info.json
index 30cdf63114..0e349f1a15 100644
--- a/keyboards/nightmare/info.json
+++ b/keyboards/nightmare/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4E49",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/nixkeyboards/day_off/config.h b/keyboards/nixkeyboards/day_off/config.h
index 84257bc8c1..d41d8337b9 100644
--- a/keyboards/nixkeyboards/day_off/config.h
+++ b/keyboards/nixkeyboards/day_off/config.h
@@ -33,7 +33,3 @@
 #define ENCODERS_PAD_B \
    { B1 }
 #define ENCODER_RESOLUTION 4
-/* Set the Bootmagic key to the escape key (default key doesn't exist 0,0) */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/nixkeyboards/day_off/info.json b/keyboards/nixkeyboards/day_off/info.json
index 45a79479d7..145da5d2f4 100644
--- a/keyboards/nixkeyboards/day_off/info.json
+++ b/keyboards/nixkeyboards/day_off/info.json
@@ -8,6 +8,9 @@
        "pid": "0x444F",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ortho5by12/config.h b/keyboards/ortho5by12/config.h
index 4feca058e2..f7d7049cb3 100644
--- a/keyboards/ortho5by12/config.h
+++ b/keyboards/ortho5by12/config.h
@@ -39,6 +39,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-#define BOOTMAGIC_LITE_ROW 7
-#define BOOTMAGIC_LITE_COLUMN 2
diff --git a/keyboards/ortho5by12/info.json b/keyboards/ortho5by12/info.json
index c8494e8d6f..cf87e52e48 100644
--- a/keyboards/ortho5by12/info.json
+++ b/keyboards/ortho5by12/info.json
@@ -8,6 +8,9 @@
    "pid": "0x27DB",
    "device_version": "0.0.2"
  },
+  "bootmagic": {
+    "matrix": [7, 2]
+  },
  "processor": "atmega328p",
    "bootloader": "usbasploader",
  "layouts": {
diff --git a/keyboards/paprikman/albacore/config.h b/keyboards/paprikman/albacore/config.h
index bff42291cb..1853923eb2 100644
--- a/keyboards/paprikman/albacore/config.h
+++ b/keyboards/paprikman/albacore/config.h
@@ -58,7 +58,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
  #define DISABLE_RGB_MATRIX_DIGITAL_RAIN
 #endif
-/* Set lower left modifier key as a bootmagic key */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/paprikman/albacore/info.json b/keyboards/paprikman/albacore/info.json
index 13a7ea609d..8e36e83b94 100644
--- a/keyboards/paprikman/albacore/info.json
+++ b/keyboards/paprikman/albacore/info.json
@@ -8,6 +8,9 @@
        "pid": "0x000A",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index 2becbba727..c7fcc504e3 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -30,10 +30,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 3
 #define RGB_DI_PIN B5
 #define RGBLED_NUM 4
 #define RGBLIGHT_LIMIT_VAL 40
diff --git a/keyboards/ploopyco/mouse/info.json b/keyboards/ploopyco/mouse/info.json
index f9a3e32f41..522f996ef8 100644
--- a/keyboards/ploopyco/mouse/info.json
+++ b/keyboards/ploopyco/mouse/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4D6F",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 3]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "matrix_pins": {
diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index ce1f7448a9..2cbbe176a6 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -30,10 +30,6 @@
 #define USB_MAX_POWER_CONSUMPTION 100
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 3
 #define ROTATIONAL_TRANSFORM_ANGLE 20
 // If board has a debug LED, you can enable it by defining this
diff --git a/keyboards/ploopyco/trackball/info.json b/keyboards/ploopyco/trackball/info.json
index feb458e1c5..4d5fb44fac 100644
--- a/keyboards/ploopyco/trackball/info.json
+++ b/keyboards/ploopyco/trackball/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5442",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 3]
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/ploopyco/trackball_mini/config.h b/keyboards/ploopyco/trackball_mini/config.h
index 249db0e2ca..6f85f73dfc 100644
--- a/keyboards/ploopyco/trackball_mini/config.h
+++ b/keyboards/ploopyco/trackball_mini/config.h
@@ -31,10 +31,6 @@
 #define USB_MAX_POWER_CONSUMPTION 100
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 3
 // If board has a debug LED, you can enable it by defining this
 // #define DEBUG_LED_PIN F7
diff --git a/keyboards/ploopyco/trackball_mini/info.json b/keyboards/ploopyco/trackball_mini/info.json
index 0941cd4024..1c8ed6351a 100644
--- a/keyboards/ploopyco/trackball_mini/info.json
+++ b/keyboards/ploopyco/trackball_mini/info.json
@@ -8,6 +8,9 @@
        "pid": "0x1EAB",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 3]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/pom_keyboards/tnln95/config.h b/keyboards/pom_keyboards/tnln95/config.h
index f42c7da2be..f2ebec41de 100644
--- a/keyboards/pom_keyboards/tnln95/config.h
+++ b/keyboards/pom_keyboards/tnln95/config.h
@@ -41,10 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 10
-/* Bootmagic lite */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 4
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/pom_keyboards/tnln95/info.json b/keyboards/pom_keyboards/tnln95/info.json
index bbe6c3460c..e3a0930584 100644
--- a/keyboards/pom_keyboards/tnln95/info.json
+++ b/keyboards/pom_keyboards/tnln95/info.json
@@ -8,6 +8,9 @@
        "pid": "0x3931",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 4]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "debounce": 8,
diff --git a/keyboards/qwertlekeys/calice/config.h b/keyboards/qwertlekeys/calice/config.h
index 3efa2ebcfd..84563fbc21 100644
--- a/keyboards/qwertlekeys/calice/config.h
+++ b/keyboards/qwertlekeys/calice/config.h
@@ -21,9 +21,6 @@
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 8
-#define BOOTMAGIC_LITE_COLUMN 0
-#define BOOTMAGIC_LITE_ROW 1
 /*Define Matrix Pins */
 #define MATRIX_ROW_PINS {F0, F1, F5, F4, C6, C7, B5, B6, D4, D2, D5, D3}
 #define MATRIX_COL_PINS {D7, B4, F7, F6, D1, B7, B3, B2} 
diff --git a/keyboards/qwertlekeys/calice/info.json b/keyboards/qwertlekeys/calice/info.json
index 2715817320..5ae9eefc11 100644
--- a/keyboards/qwertlekeys/calice/info.json
+++ b/keyboards/qwertlekeys/calice/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/rad/config.h b/keyboards/rad/config.h
index 0c9bac6f3a..9cce11cb81 100644
--- a/keyboards/rad/config.h
+++ b/keyboards/rad/config.h
@@ -25,7 +25,3 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
-/* Bootmagic key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 2
diff --git a/keyboards/rad/info.json b/keyboards/rad/info.json
index 46659d40e2..09f0d94059 100644
--- a/keyboards/rad/info.json
+++ b/keyboards/rad/info.json
@@ -6,6 +6,9 @@
    "pid": "0x6060",
    "device_version": "0.0.1"
  },
+  "bootmagic": {
+    "matrix": [0, 2]
+  },
  "processor": "atmega32u4",
  "bootloader": "caterina",
  "layouts": {
diff --git a/keyboards/rart/rart60/config.h b/keyboards/rart/rart60/config.h
index a4d25fc51f..643ce3d657 100644
--- a/keyboards/rart/rart60/config.h
+++ b/keyboards/rart/rart60/config.h
@@ -36,6 +36,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
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/rart/rart60/info.json b/keyboards/rart/rart60/info.json
index 7ce36e5042..91e8eef9ee 100644
--- a/keyboards/rart/rart60/info.json
+++ b/keyboards/rart/rart60/info.json
@@ -23,6 +23,9 @@
        "pid": "0x0060",
        "vid": "0x414C"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [
diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
index 79d1b7da64..92592a007d 100644
--- a/keyboards/rart/rart75hs/config.h
+++ b/keyboards/rart/rart75hs/config.h
@@ -42,9 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B { C2 }
 #define ENCODER_RESOLUTION 4 //default/suggested
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
 #define RGB_DI_PIN C0
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json
index 6440868804..8056508f6f 100644
--- a/keyboards/rart/rart75hs/info.json
+++ b/keyboards/rart/rart75hs/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5575",
        "device_version": "0.0.3"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/rart/rart80/config.h b/keyboards/rart/rart80/config.h
index 9186d08571..7657051e01 100644
--- a/keyboards/rart/rart80/config.h
+++ b/keyboards/rart/rart80/config.h
@@ -38,9 +38,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_CAPS_LOCK_PIN D4
 #define LED_PIN_ON_STATE 0
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 1
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/rart/rart80/info.json b/keyboards/rart/rart80/info.json
index f34f16be36..47d54cc7ec 100644
--- a/keyboards/rart/rart80/info.json
+++ b/keyboards/rart/rart80/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0080",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "atmega32a",
    "bootloader": "usbasploader",
    "layouts": {
diff --git a/keyboards/recompile_keys/nomu30/config.h b/keyboards/recompile_keys/nomu30/config.h
index 40cc4608c3..f5e563088e 100644
--- a/keyboards/recompile_keys/nomu30/config.h
+++ b/keyboards/recompile_keys/nomu30/config.h
@@ -21,7 +21,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 12
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 11
diff --git a/keyboards/recompile_keys/nomu30/info.json b/keyboards/recompile_keys/nomu30/info.json
index 7521023d1b..7fa6be0d39 100644
--- a/keyboards/recompile_keys/nomu30/info.json
+++ b/keyboards/recompile_keys/nomu30/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4E31",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 11]
+    },
    "layouts": {
        "LAYOUT": {
            "layout": [
diff --git a/keyboards/rocketboard_16/config.h b/keyboards/rocketboard_16/config.h
index 429c2e0073..96cac16f8e 100644
--- a/keyboards/rocketboard_16/config.h
+++ b/keyboards/rocketboard_16/config.h
@@ -25,10 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { B8, B9, B10, B11 }
 #define DIODE_DIRECTION COL2ROW
-/* Bootmagic key - row 4, col 1 */
-#define BOOTMAGIC_LITE_ROW 4
-#define BOOTMAGIC_LITE_COLUMN 1
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json
index f9accb9629..4e81d951a7 100644
--- a/keyboards/rocketboard_16/info.json
+++ b/keyboards/rocketboard_16/info.json
@@ -8,6 +8,9 @@
        "pid": "0xFF16",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [4, 1]
+    },
    "layout_aliases": {
        "LAYOUT_default": "LAYOUT"
    },
diff --git a/keyboards/rpiguy9907/southpaw66/config.h b/keyboards/rpiguy9907/southpaw66/config.h
index a19645dcc2..ee105e9d31 100644
--- a/keyboards/rpiguy9907/southpaw66/config.h
+++ b/keyboards/rpiguy9907/southpaw66/config.h
@@ -35,7 +35,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/rpiguy9907/southpaw66/info.json b/keyboards/rpiguy9907/southpaw66/info.json
index 5e206811a6..656f4b9568 100644
--- a/keyboards/rpiguy9907/southpaw66/info.json
+++ b/keyboards/rpiguy9907/southpaw66/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5366",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/sck/m0116b/config.h b/keyboards/sck/m0116b/config.h
index b949fa2106..de871b05f2 100644
--- a/keyboards/sck/m0116b/config.h
+++ b/keyboards/sck/m0116b/config.h
@@ -58,7 +58,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 6
diff --git a/keyboards/sck/m0116b/info.json b/keyboards/sck/m0116b/info.json
index 5180511a9d..8588e9d605 100644
--- a/keyboards/sck/m0116b/info.json
+++ b/keyboards/sck/m0116b/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0000",
    "device_version": "0.0.1"
  },
+  "bootmagic": {
+    "matrix": [0, 6]
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h
index 86398bd057..0f63db4e3b 100644
--- a/keyboards/sneakbox/aliceclone/config.h
+++ b/keyboards/sneakbox/aliceclone/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*Bootmagic boot button, set to topmost, leftmost key */
-#define BOOTMAGIC_LITE_ROW      2
-#define BOOTMAGIC_LITE_COLUMN   0
 /* encoder */
 /* #define NUMBER_OF_ENCODERS 1 */
 #define ENCODERS_PAD_A { D3 }
diff --git a/keyboards/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json
index 9637022b52..c2c0b011a3 100644
--- a/keyboards/sneakbox/aliceclone/info.json
+++ b/keyboards/sneakbox/aliceclone/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0001",
    "device_version": "0.0.1"
  },
+  "bootmagic": {
+    "matrix": [2, 0]
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["alice", "alice_split_bs"],
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
index c1a9873cd4..3fc0e22758 100644
--- a/keyboards/sneakbox/aliceclonergb/config.h
+++ b/keyboards/sneakbox/aliceclonergb/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*Bootmagic boot button, set to topmost, leftmost key */
-#define BOOTMAGIC_LITE_ROW      2
-#define BOOTMAGIC_LITE_COLUMN   0
 /* encoder */
 /* #define NUMBER_OF_ENCODERS 1 */
 #define ENCODERS_PAD_A { D3 }
diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json
index 5a382f0bf8..69c7c7673f 100644
--- a/keyboards/sneakbox/aliceclonergb/info.json
+++ b/keyboards/sneakbox/aliceclonergb/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0006",
    "device_version": "0.0.1"
  },
+  "bootmagic": {
+    "matrix": [2, 0]
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "community_layouts": ["alice", "alice_split_bs"],
diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h
index 28b628f699..f3e63d974e 100644
--- a/keyboards/sneakbox/ava/config.h
+++ b/keyboards/sneakbox/ava/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*Bootmagic boot button, set to topmost, leftmost key */
-#define BOOTMAGIC_LITE_ROW      2
-#define BOOTMAGIC_LITE_COLUMN   0
 /* encoder */
 /* #define NUMBER_OF_ENCODERS 1 */
 #define ENCODERS_PAD_A { D3 }
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json
index 8f81e0bc4b..308a79fa3c 100644
--- a/keyboards/sneakbox/ava/info.json
+++ b/keyboards/sneakbox/ava/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0004",
    "device_version": "0.0.1"
  },
+  "bootmagic": {
+    "matrix": [2, 0]
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layout_aliases": {
diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h
index 0246a0cc72..226e6ed2c4 100644
--- a/keyboards/sneakbox/disarray/ortho/config.h
+++ b/keyboards/sneakbox/disarray/ortho/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*Bootmagic boot button, set to topmost, leftmost key */
-#define BOOTMAGIC_LITE_ROW      1
-#define BOOTMAGIC_LITE_COLUMN   0
 /* encoder */
 /* #define NUMBER_OF_ENCODERS 1 */
 #define ENCODERS_PAD_A { B3 }
diff --git a/keyboards/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/info.json
index 63b9223d7c..34fcd1a65e 100644
--- a/keyboards/sneakbox/disarray/ortho/info.json
+++ b/keyboards/sneakbox/disarray/ortho/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0003",
    "device_version": "0.0.1"
  },
+  "bootmagic": {
+    "matrix": [1, 0]
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h
index f39a5ccdcc..ee3d5b5624 100644
--- a/keyboards/sneakbox/disarray/staggered/config.h
+++ b/keyboards/sneakbox/disarray/staggered/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
-/*Bootmagic boot button, set to topmost, leftmost key */
-#define BOOTMAGIC_LITE_ROW      1
-#define BOOTMAGIC_LITE_COLUMN   0
 /* encoder */
 /* #define NUMBER_OF_ENCODERS 1 */
 #define ENCODERS_PAD_A { B3 }
diff --git a/keyboards/sneakbox/disarray/staggered/info.json b/keyboards/sneakbox/disarray/staggered/info.json
index b660922090..3c635f7bd1 100644
--- a/keyboards/sneakbox/disarray/staggered/info.json
+++ b/keyboards/sneakbox/disarray/staggered/info.json
@@ -8,6 +8,9 @@
    "pid": "0x0002",
    "device_version": "0.0.1"
  },
+  "bootmagic": {
+    "matrix": [1, 0]
+  },
  "processor": "atmega32u4",
  "bootloader": "atmel-dfu",
  "layouts": {
diff --git a/keyboards/soup10/config.h b/keyboards/soup10/config.h
index 3c7f23d8c7..20754fa2b3 100644
--- a/keyboards/soup10/config.h
+++ b/keyboards/soup10/config.h
@@ -65,7 +65,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
diff --git a/keyboards/soup10/info.json b/keyboards/soup10/info.json
index fa4b129e57..e96e371d3e 100644
--- a/keyboards/soup10/info.json
+++ b/keyboards/soup10/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "atmega32u4",
    "bootloader": "caterina",
    "layouts": {
diff --git a/keyboards/splitkb/aurora/corne/rev1/config.h b/keyboards/splitkb/aurora/corne/rev1/config.h
index 7f95a83a6e..340aff824a 100644
--- a/keyboards/splitkb/aurora/corne/rev1/config.h
+++ b/keyboards/splitkb/aurora/corne/rev1/config.h
@@ -33,13 +33,3 @@
 #    define RGB_MATRIX_SPLIT { 27, 27 }
 #    define SPLIT_TRANSPORT_MIRROR
 #endif
-// Not yet available in `info.json`
-#ifdef BOOTMAGIC_ENABLE
-     // Top left key on left half
-#    define BOOTMAGIC_LITE_ROW 0
-#    define BOOTMAGIC_LITE_COLUMN 5
-     // Top right key on right half
-#    define BOOTMAGIC_LITE_ROW_RIGHT    4
-#    define BOOTMAGIC_LITE_COLUMN_RIGHT 5
-#endif
diff --git a/keyboards/splitkb/aurora/corne/rev1/info.json b/keyboards/splitkb/aurora/corne/rev1/info.json
index 4c5e5458de..64da285877 100644
--- a/keyboards/splitkb/aurora/corne/rev1/info.json
+++ b/keyboards/splitkb/aurora/corne/rev1/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "pid": "0x343A"
    },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
    "features": {
        "mousekey": true,
        "bootmagic": true,
@@ -79,6 +82,9 @@
        ]
    },
    "split": {
+        "bootmagic": {
+            "matrix": [4, 5]
+        },
        "soft_serial_pin": "D2",
        "main": "pin",
        "matrix_pins": {
diff --git a/keyboards/splitkb/aurora/lily58/rev1/config.h b/keyboards/splitkb/aurora/lily58/rev1/config.h
index d443782713..7cf66588b9 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/config.h
+++ b/keyboards/splitkb/aurora/lily58/rev1/config.h
@@ -33,13 +33,3 @@
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define SPLIT_TRANSPORT_MIRROR
 #endif
-// Not yet available in `info.json`
-#ifdef BOOTMAGIC_ENABLE
-     // 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    5
-#    define BOOTMAGIC_LITE_COLUMN_RIGHT 0
-#endif
diff --git a/keyboards/splitkb/aurora/lily58/rev1/info.json b/keyboards/splitkb/aurora/lily58/rev1/info.json
index 4a6a05ff63..4c00eedbeb 100644
--- a/keyboards/splitkb/aurora/lily58/rev1/info.json
+++ b/keyboards/splitkb/aurora/lily58/rev1/info.json
@@ -93,6 +93,9 @@
        ]
    },
    "split": {
+        "bootmagic": {
+            "matrix": [5, 0]
+        },
        "soft_serial_pin": "D2",
        "main": "matrix_grid",
        "matrix_pins": {
diff --git a/keyboards/splitkb/aurora/sweep/rev1/config.h b/keyboards/splitkb/aurora/sweep/rev1/config.h
index 98bdc4b14d..edab8afcda 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/config.h
+++ b/keyboards/splitkb/aurora/sweep/rev1/config.h
@@ -33,13 +33,3 @@
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define SPLIT_TRANSPORT_MIRROR
 #endif
-// Not yet available in `info.json`
-#ifdef BOOTMAGIC_ENABLE
-     // Top left key on left half
-#    define BOOTMAGIC_LITE_ROW 0
-#    define BOOTMAGIC_LITE_COLUMN 4
-     // Top right key on right half
-#    define BOOTMAGIC_LITE_ROW_RIGHT    4
-#    define BOOTMAGIC_LITE_COLUMN_RIGHT 4
-#endif
diff --git a/keyboards/splitkb/aurora/sweep/rev1/info.json b/keyboards/splitkb/aurora/sweep/rev1/info.json
index 57b2754eac..dc1cfeea82 100644
--- a/keyboards/splitkb/aurora/sweep/rev1/info.json
+++ b/keyboards/splitkb/aurora/sweep/rev1/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "pid": "0xEC17"
    },
+    "bootmagic": {
+        "matrix": [0, 4]
+    },
    "features": {
        "mousekey": true,
        "bootmagic": true,
@@ -78,6 +81,9 @@
        ]
    },
    "split": {
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
        "soft_serial_pin": "D2",
        "main": "pin",
        "matrix_pins": {
diff --git a/keyboards/splitkb/kyria/rev3/config.h b/keyboards/splitkb/kyria/rev3/config.h
index 5cbf317d8d..6d6a72f3ac 100644
--- a/keyboards/splitkb/kyria/rev3/config.h
+++ b/keyboards/splitkb/kyria/rev3/config.h
@@ -33,13 +33,3 @@
 #    define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #    define SPLIT_TRANSPORT_MIRROR
 #endif
-// Not yet available in `info.json`
-#ifdef BOOTMAGIC_ENABLE
-     // Top left key on left half
-#    define BOOTMAGIC_LITE_ROW 0
-#    define BOOTMAGIC_LITE_COLUMN 6
-     // Top right key on right half
-#    define BOOTMAGIC_LITE_ROW_RIGHT    4
-#    define BOOTMAGIC_LITE_COLUMN_RIGHT 6
-#endif
diff --git a/keyboards/splitkb/kyria/rev3/info.json b/keyboards/splitkb/kyria/rev3/info.json
index 2717d63ff1..71191323a6 100644
--- a/keyboards/splitkb/kyria/rev3/info.json
+++ b/keyboards/splitkb/kyria/rev3/info.json
@@ -3,6 +3,9 @@
    "usb": {
        "pid": "0xCF44",
    },
+    "bootmagic": {
+        "matrix": [0, 6]
+    },
    "features": {
        "mousekey": true,
        "bootmagic": true,
@@ -145,6 +148,9 @@
        ]
    },
    "split": {
+        "bootmagic": {
+            "matrix": [4, 6]
+        },
        "soft_serial_pin": "D2",
        "main": "matrix_grid",
        "matrix_pins": {
diff --git a/keyboards/swiftrax/retropad/config.h b/keyboards/swiftrax/retropad/config.h
index bdfadfa95b..19ee508a34 100644
--- a/keyboards/swiftrax/retropad/config.h
+++ b/keyboards/swiftrax/retropad/config.h
@@ -53,7 +53,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /*EEPROM for via*/
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
-/* bootmagic row col assignment */
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/swiftrax/retropad/info.json b/keyboards/swiftrax/retropad/info.json
index 021c013eae..700ec883b8 100644
--- a/keyboards/swiftrax/retropad/info.json
+++ b/keyboards/swiftrax/retropad/info.json
@@ -8,6 +8,9 @@
        "pid": "0xEB0C",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
    "processor": "atmega32u2",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/synthlabs/solo/config.h b/keyboards/synthlabs/solo/config.h
index 78a58bf9c4..7f5224d1f2 100644
--- a/keyboards/synthlabs/solo/config.h
+++ b/keyboards/synthlabs/solo/config.h
@@ -17,9 +17,6 @@
 #define FORCE_NKRO
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 1
 #define JOYSTICK_BUTTON_COUNT 13
 #define JOYSTICK_AXIS_COUNT 1
 #define JOYSTICK_AXIS_RESOLUTION 16
diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json
index 4ac5201b98..23566e9558 100644
--- a/keyboards/synthlabs/solo/info.json
+++ b/keyboards/synthlabs/solo/info.json
@@ -17,6 +17,9 @@
        "pid": "0x3031",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 1]
+    },
    "layouts": {
        "LAYOUT_all": {
            "layout": [
diff --git a/keyboards/tweetydabird/lbs6/config.h b/keyboards/tweetydabird/lbs6/config.h
deleted file mode 100644
index 27f3694737..0000000000
--- a/keyboards/tweetydabird/lbs6/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2022 Markus Knutsson (@TweetyDaBird)
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-// Bootmagic Lite key configuration
-// Not yet supported in info.json ?
-#define BOOTMAGIC_LITE_ROW 2
-#define BOOTMAGIC_LITE_COLUMN 2
diff --git a/keyboards/tweetydabird/lbs6/info.json b/keyboards/tweetydabird/lbs6/info.json
index 017a223a1d..a0612fabd6 100644
--- a/keyboards/tweetydabird/lbs6/info.json
+++ b/keyboards/tweetydabird/lbs6/info.json
@@ -26,6 +26,9 @@
        "pid": "0x23B0",
        "device_version": "1.1.0"
    },
+    "bootmagic": {
+        "matrix": [2, 2]
+    },
    
    "matrix_pins": {
        "direct": [
diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h
index aa4a75f88e..2a81b1e411 100644
--- a/keyboards/unison/v04/config.h
+++ b/keyboards/unison/v04/config.h
@@ -72,18 +72,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 /*
- * BOOTMAGIC Lite
- * Hold Left-Top key to enter bootloader.
- *
- * NOTE:
- * With Round-Robin matrix, diagonal position is always High.
- * So, the default (0,0) is always judged as hold and keyboard enters bootloader.
- * To prevent this, set specific position for it.
- */
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 0
-/*
 * Feature disable options
 *  These options are also useful to firmware size reduction.
 */
diff --git a/keyboards/unison/v04/info.json b/keyboards/unison/v04/info.json
index d0122e8108..cc0c77609b 100644
--- a/keyboards/unison/v04/info.json
+++ b/keyboards/unison/v04/info.json
@@ -8,6 +8,9 @@
        "pid": "0x176A",
        "device_version": "0.4.0"
    },
+    "bootmagic": {
+        "matrix": [5, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/viktus/smolka/config.h b/keyboards/viktus/smolka/config.h
index ecbc354ed6..ed0bb8ea18 100644
--- a/keyboards/viktus/smolka/config.h
+++ b/keyboards/viktus/smolka/config.h
@@ -63,7 +63,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
diff --git a/keyboards/viktus/smolka/info.json b/keyboards/viktus/smolka/info.json
index 6627cbfb2e..cc6f72f76c 100644
--- a/keyboards/viktus/smolka/info.json
+++ b/keyboards/viktus/smolka/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0010",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/w1_at/config.h b/keyboards/w1_at/config.h
index 2817d9ddca..02c434508a 100644
--- a/keyboards/w1_at/config.h
+++ b/keyboards/w1_at/config.h
@@ -37,7 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_SCROLL_LOCK_PIN A15
 #define LED_KANA_PIN A13
 #define LED_PIN_ON_STATE 0
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 2
diff --git a/keyboards/w1_at/info.json b/keyboards/w1_at/info.json
index 12d8990ac4..b396c65f9d 100644
--- a/keyboards/w1_at/info.json
+++ b/keyboards/w1_at/info.json
@@ -8,6 +8,9 @@
        "pid": "0x5754",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
    "processor": "STM32F072",
    "bootloader": "stm32-dfu",
    "layouts": {
diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h
index 2822af783e..0735f41ab4 100644
--- a/keyboards/wavtype/foundation/config.h
+++ b/keyboards/wavtype/foundation/config.h
@@ -70,7 +70,3 @@
 //#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
diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json
index 984511c77d..36153f2bca 100644
--- a/keyboards/wavtype/foundation/info.json
+++ b/keyboards/wavtype/foundation/info.json
@@ -8,6 +8,9 @@
        "pid": "0x0003",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 1]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index e48ce5785d..547be293b9 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -135,9 +135,5 @@ 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 11
 #define ENCODERS_PAD_A { D0, D2, D5 }
 #define ENCODERS_PAD_B { D1, D3, D4 }
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index 169e9eab2e..25641426d1 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -7,6 +7,9 @@
        "vid": "0x574C",
        "pid": "0x1DF9"
    },
+    "bootmagic": {
+        "matrix": [0, 11]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index 6fff3c294e..e0cf1267fe 100644
--- a/keyboards/work_louder/nano/config.h
+++ b/keyboards/work_louder/nano/config.h
@@ -135,10 +135,6 @@ 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 2
 #define ENCODERS_PAD_A \
    { D7 }
 #define ENCODERS_PAD_B \
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index 4464448621..1f33088a7c 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -8,6 +8,9 @@
        "pid": "0xE6F0",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [0, 2]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layouts": {
diff --git a/keyboards/yiancardesigns/seigaiha/config.h b/keyboards/yiancardesigns/seigaiha/config.h
index fba7b37137..de93e5ecb2 100644
--- a/keyboards/yiancardesigns/seigaiha/config.h
+++ b/keyboards/yiancardesigns/seigaiha/config.h
@@ -43,9 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define USB_MAX_POWER_CONSUMPTION 100
-#define BOOTMAGIC_LITE_ROW 1
-#define BOOTMAGIC_LITE_COLUMN 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/yiancardesigns/seigaiha/info.json b/keyboards/yiancardesigns/seigaiha/info.json
index 04e06f31d8..cf650067f1 100644
--- a/keyboards/yiancardesigns/seigaiha/info.json
+++ b/keyboards/yiancardesigns/seigaiha/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4750",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [1, 0]
+    },
    "processor": "atmega328p",
    "bootloader": "usbasploader",
    "community_layouts": ["alice_split_bs"],
diff --git a/keyboards/ymdk/melody96/config.h b/keyboards/ymdk/melody96/config.h
index cc15e43b0f..21e724b43f 100644
--- a/keyboards/ymdk/melody96/config.h
+++ b/keyboards/ymdk/melody96/config.h
@@ -22,10 +22,6 @@
 #define BACKLIGHT_LEVELS 5
 #endif
-/* Set location for BootMagic key*/
-#define BOOTMAGIC_LITE_ROW 5
-#define BOOTMAGIC_LITE_COLUMN 0
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ymdk/melody96/info.json b/keyboards/ymdk/melody96/info.json
index 2492d37dcb..1c21c0fdeb 100644
--- a/keyboards/ymdk/melody96/info.json
+++ b/keyboards/ymdk/melody96/info.json
@@ -8,6 +8,9 @@
        "pid": "0x4D96",
        "device_version": "0.0.1"
    },
+    "bootmagic": {
+        "matrix": [5, 0]
+    },
    "processor": "atmega32u4",
    "bootloader": "atmel-dfu",
    "layout_aliases": {
diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h
index ef606f5243..841b102262 100644
--- a/keyboards/zvecr/split_blackpill/config.h
+++ b/keyboards/zvecr/split_blackpill/config.h
@@ -86,9 +86,3 @@
 //#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 0
-#define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
diff --git a/keyboards/zvecr/split_blackpill/info.json b/keyboards/zvecr/split_blackpill/info.json
index 57fc7b2e1c..7f04e2a9bc 100644
--- a/keyboards/zvecr/split_blackpill/info.json
+++ b/keyboards/zvecr/split_blackpill/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0001",
        "device_version": "0.0.1"
    },
+    "split": {
+        "bootmagic": {
+            "matrix": [4, 0]
+        }
+    },
    "processor": "STM32F103",
    "bootloader": "stm32duino",
    "community_layouts": ["ortho_4x12"],
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index 38935d31c1..c8d8522c2e 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/config.h
@@ -92,9 +92,3 @@
 //#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 0
-#define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
diff --git a/keyboards/zvecr/zv48/info.json b/keyboards/zvecr/zv48/info.json
index 8ae18b0e49..ac15623f50 100644
--- a/keyboards/zvecr/zv48/info.json
+++ b/keyboards/zvecr/zv48/info.json
@@ -8,6 +8,11 @@
        "pid": "0x0048",
        "device_version": "0.0.1"
    },
+    "split": {
+        "bootmagic": {
+            "matrix": [4, 0]
+        }
+    },
    "community_layouts": ["ortho_4x12"],
    "layouts": {
        "LAYOUT_ortho_4x12": {
author	Ryan <fauxpark@gmail.com>	2023-02-17 08:49:49 +1100
committer	GitHub <noreply@github.com>	2023-02-17 08:49:49 +1100
commit	d784f78bd0a034c1d6085379615014fd701536ab (patch)
tree	2b81c4e8848ebc8dece2ad9aaa8126d12a87825c
parent	7fad94ba2d5092abe451d0bbc95caaa37fec95bc (diff)