Migrate build target markers to keyboard.json - DE (#23515)

60 files changed, 52 insertions, 269 deletions

diff --git a/keyboards/dasky/reverb/info.json b/keyboards/dasky/reverb/keyboard.json
index e7e203ebf6..e7e203ebf6 100644
--- a/keyboards/dasky/reverb/info.json
+++ b/keyboards/dasky/reverb/keyboard.json
diff --git a/keyboards/dc01/arrow/info.json b/keyboards/dc01/arrow/keyboard.json
index 85ca25c23e..85ca25c23e 100644
--- a/keyboards/dc01/arrow/info.json
+++ b/keyboards/dc01/arrow/keyboard.json
diff --git a/keyboards/dc01/left/info.json b/keyboards/dc01/left/keyboard.json
index e296790995..e296790995 100644
--- a/keyboards/dc01/left/info.json
+++ b/keyboards/dc01/left/keyboard.json
diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/keyboard.json
index 0cf73c23e3..0cf73c23e3 100644
--- a/keyboards/dc01/numpad/info.json
+++ b/keyboards/dc01/numpad/keyboard.json
diff --git a/keyboards/dc01/right/info.json b/keyboards/dc01/right/keyboard.json
index 6f48e05483..6f48e05483 100644
--- a/keyboards/dc01/right/info.json
+++ b/keyboards/dc01/right/keyboard.json
diff --git a/keyboards/dcpedit/redherring/info.json b/keyboards/dcpedit/redherring/keyboard.json
index 845c52e3e0..845c52e3e0 100644
--- a/keyboards/dcpedit/redherring/info.json
+++ b/keyboards/dcpedit/redherring/keyboard.json
diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/keyboard.json
index a26d727f12..a26d727f12 100644
--- a/keyboards/deng/thirty/info.json
+++ b/keyboards/deng/thirty/keyboard.json
diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/keyboard.json
index bc3546a082..bc3546a082 100644
--- a/keyboards/dichotomy/info.json
+++ b/keyboards/dichotomy/keyboard.json
diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/keyboard.json
index a2052e5562..a2052e5562 100644
--- a/keyboards/dm9records/plaid/info.json
+++ b/keyboards/dm9records/plaid/keyboard.json
diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/keyboard.json
index 208dcf330b..208dcf330b 100644
--- a/keyboards/dm9records/tartan/info.json
+++ b/keyboards/dm9records/tartan/keyboard.json
diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/keyboard.json
index e1382860b8..e1382860b8 100644
--- a/keyboards/doio/kb16/rev1/info.json
+++ b/keyboards/doio/kb16/rev1/keyboard.json
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/keyboard.json
index a115707291..a115707291 100644
--- a/keyboards/doio/kb16/rev2/info.json
+++ b/keyboards/doio/kb16/rev2/keyboard.json
diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/keyboard.json
index 7e978b2be8..7e978b2be8 100644
--- a/keyboards/doio/kb38/info.json
+++ b/keyboards/doio/kb38/keyboard.json
diff --git a/keyboards/dp60/info.json b/keyboards/dp60/keyboard.json
index c9b3b6fdde..c9b3b6fdde 100644
--- a/keyboards/dp60/info.json
+++ b/keyboards/dp60/keyboard.json
diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h
deleted file mode 100644
index 4ae200c6a6..0000000000
--- a/keyboards/draytronics/scarlet/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*Copyright 2020 Blake Drayson / Draytronics
-
-Contact info@draytronics.co.uk
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * 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/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/keyboard.json
index b70c7bfae6..0eabd378da 100644
--- a/keyboards/draytronics/scarlet/info.json
+++ b/keyboards/draytronics/scarlet/keyboard.json
@@ -20,6 +20,12 @@
         "mousekey": true,
         "extrakey": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "community_layouts": ["numpad_5x4"],
     "layouts": {
         "LAYOUT_numpad_5x4": {
diff --git a/keyboards/drop/alt/v2/info.json b/keyboards/drop/alt/v2/keyboard.json
index 8363aca5cf..8363aca5cf 100644
--- a/keyboards/drop/alt/v2/info.json
+++ b/keyboards/drop/alt/v2/keyboard.json
diff --git a/keyboards/drop/cstm65/info.json b/keyboards/drop/cstm65/keyboard.json
index 708649966e..708649966e 100644
--- a/keyboards/drop/cstm65/info.json
+++ b/keyboards/drop/cstm65/keyboard.json
diff --git a/keyboards/drop/cstm80/info.json b/keyboards/drop/cstm80/keyboard.json
index 5ce4e666b1..5ce4e666b1 100644
--- a/keyboards/drop/cstm80/info.json
+++ b/keyboards/drop/cstm80/keyboard.json
diff --git a/keyboards/drop/ctrl/v2/info.json b/keyboards/drop/ctrl/v2/keyboard.json
index f461800dde..f461800dde 100644
--- a/keyboards/drop/ctrl/v2/info.json
+++ b/keyboards/drop/ctrl/v2/keyboard.json
diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/keyboard.json
index 052b494375..052b494375 100644
--- a/keyboards/drop/sense75/info.json
+++ b/keyboards/drop/sense75/keyboard.json
diff --git a/keyboards/drop/shift/v2/info.json b/keyboards/drop/shift/v2/keyboard.json
index 212263d71c..212263d71c 100644
--- a/keyboards/drop/shift/v2/info.json
+++ b/keyboards/drop/shift/v2/keyboard.json
diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/keyboard.json
index 9c16c48db3..9c16c48db3 100644
--- a/keyboards/duck/eagle_viper/v2/info.json
+++ b/keyboards/duck/eagle_viper/v2/keyboard.json
diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/keyboard.json
index a97ff193a8..a97ff193a8 100644
--- a/keyboards/duck/jetfire/info.json
+++ b/keyboards/duck/jetfire/keyboard.json
diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/keyboard.json
index d4e1cd1e35..d4e1cd1e35 100644
--- a/keyboards/duck/lightsaver/info.json
+++ b/keyboards/duck/lightsaver/keyboard.json
diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/keyboard.json
index 47f3acdc4d..47f3acdc4d 100644
--- a/keyboards/duck/octagon/v1/info.json
+++ b/keyboards/duck/octagon/v1/keyboard.json
diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/keyboard.json
index 4afbc42d47..4afbc42d47 100644
--- a/keyboards/duck/octagon/v2/info.json
+++ b/keyboards/duck/octagon/v2/keyboard.json
diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/keyboard.json
index 280cd8b07f..280cd8b07f 100644
--- a/keyboards/duck/orion/v3/info.json
+++ b/keyboards/duck/orion/v3/keyboard.json
diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/keyboard.json
index c03142b4db..c03142b4db 100644
--- a/keyboards/duck/tcv3/info.json
+++ b/keyboards/duck/tcv3/keyboard.json
diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/keyboard.json
index a39945d68c..a39945d68c 100644
--- a/keyboards/ducky/one2mini/1861st/info.json
+++ b/keyboards/ducky/one2mini/1861st/keyboard.json
diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/keyboard.json
index 3bb58fd48f..3bb58fd48f 100644
--- a/keyboards/ducky/one2sf/1967st/info.json
+++ b/keyboards/ducky/one2sf/1967st/keyboard.json
diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/keyboard.json
index 94dae4d809..94dae4d809 100644
--- a/keyboards/durgod/k310/base/info.json
+++ b/keyboards/durgod/k310/base/keyboard.json
diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/keyboard.json
index 7678e9985c..7678e9985c 100644
--- a/keyboards/dztech/dz60rgb/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb/v2_1/keyboard.json
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json
index 9d3b1efeac..9d3b1efeac 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json
index 968488e544..968488e544 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json
diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/keyboard.json
index 8fef8b3468..8fef8b3468 100644
--- a/keyboards/dztech/dz65rgb/v3/info.json
+++ b/keyboards/dztech/dz65rgb/v3/keyboard.json
diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
deleted file mode 100644
index 89b008296b..0000000000
--- a/keyboards/edi/hardlight/mk1/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Enable Audio Subsystem with two voices
- */
-// #define AUDIO_PIN C6
diff --git a/keyboards/edi/hardlight/mk1/keyboard.json b/keyboards/edi/hardlight/mk1/keyboard.json
index 7f33c26227..3cb07cb2f1 100644
--- a/keyboards/edi/hardlight/mk1/keyboard.json
+++ b/keyboards/edi/hardlight/mk1/keyboard.json
@@ -16,6 +16,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"],
         "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index 52636c6484..bd604db684 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5
 
 /* PWM RGB Underglow Defines */
diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/keyboard.json
index cb337b71c8..a1f47aabf5 100644
--- a/keyboards/edi/hardlight/mk2/info.json
+++ b/keyboards/edi/hardlight/mk2/keyboard.json
@@ -43,6 +43,12 @@
         "velocikey": true,
         "key_lock": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "community_layouts": ["ortho_4x16"],
     "layouts": {
         "LAYOUT_ortho_4x16": {
diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/keyboard.json
index 374f10b2b7..374f10b2b7 100644
--- a/keyboards/edinburgh41/info.json
+++ b/keyboards/edinburgh41/keyboard.json
diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h
deleted file mode 100644
index 46a265902c..0000000000
--- a/keyboards/efreet/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2019 Amber Holly
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * 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/efreet/info.json b/keyboards/efreet/keyboard.json
index 4a53df1294..7dac78cc39 100644
--- a/keyboards/efreet/info.json
+++ b/keyboards/efreet/keyboard.json
@@ -27,6 +27,12 @@
         "nkro": true,
         "backlight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "community_layouts": ["ortho_4x12", "planck_mit"],
     "layouts": {
         "LAYOUT_planck_mit": {
diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/keyboard.json
index 6ed958463e..6ed958463e 100644
--- a/keyboards/elcantorhs/info.json
+++ b/keyboards/elcantorhs/keyboard.json
diff --git a/keyboards/emery65/info.json b/keyboards/emery65/keyboard.json
index c80bcf8042..c80bcf8042 100644
--- a/keyboards/emery65/info.json
+++ b/keyboards/emery65/keyboard.json
diff --git a/keyboards/ergodox_ez/shine/info.json b/keyboards/ergodox_ez/shine/keyboard.json
index bc0f218d7e..bc0f218d7e 100644
--- a/keyboards/ergodox_ez/shine/info.json
+++ b/keyboards/ergodox_ez/shine/keyboard.json
diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/keyboard.json
index 24e90ad7d7..9315a3971f 100644
--- a/keyboards/ergodox_stm32/info.json
+++ b/keyboards/ergodox_stm32/keyboard.json
@@ -15,7 +15,9 @@
         "nkro": true,
         "unicode": true
     },
-"layouts": {
+    "processor": "STM32F103",
+    "bootloader": "custom",
+    "layouts": {
         "LAYOUT_ergodox": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk
index 21b474509d..a4e9df8c6a 100644
--- a/keyboards/ergodox_stm32/rules.mk
+++ b/keyboards/ergodox_stm32/rules.mk
@@ -1,11 +1,7 @@
-# MCU name
-MCU = STM32F103
+# custom bootloader
 MCU_LDSCRIPT = stm32f103_bootloader
 BOARD = ST_NUCLEO64_F103RB
 
-# Bootloader selection
-BOOTLOADER = custom
-
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h
deleted file mode 100644
index 055e8afe38..0000000000
--- a/keyboards/ericrlau/numdiscipline/rev1/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Eric Lau
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * 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/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json
index 6fd9c377f6..5e9f393732 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/info.json
+++ b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json
@@ -21,6 +21,12 @@
         "mousekey": true,
         "extrakey": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h
deleted file mode 100644
index 230ff5e311..0000000000
--- a/keyboards/evyd13/eon40/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * 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/evyd13/eon40/info.json b/keyboards/evyd13/eon40/keyboard.json
index 59511f117c..e957b109ff 100644
--- a/keyboards/evyd13/eon40/info.json
+++ b/keyboards/evyd13/eon40/keyboard.json
@@ -34,6 +34,12 @@
     "command": true,
     "encoder": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "community_layouts": ["ortho_4x12", "planck_mit"],
   "layouts": {
     "LAYOUT_ortho_4x12": {
diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h
deleted file mode 100644
index f64827d05f..0000000000
--- a/keyboards/evyd13/nt660/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Evy Dekkers
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * 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/evyd13/nt660/info.json b/keyboards/evyd13/nt660/keyboard.json
index ea51efaa30..142e9f2920 100644
--- a/keyboards/evyd13/nt660/info.json
+++ b/keyboards/evyd13/nt660/keyboard.json
@@ -28,6 +28,12 @@
         "mousekey": false,
         "extrakey": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "community_layouts": ["66_ansi", "66_iso"],
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h
deleted file mode 100644
index 230ff5e311..0000000000
--- a/keyboards/evyd13/pockettype/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * 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/evyd13/pockettype/info.json b/keyboards/evyd13/pockettype/keyboard.json
index bcca3dc936..358e89020a 100644
--- a/keyboards/evyd13/pockettype/info.json
+++ b/keyboards/evyd13/pockettype/keyboard.json
@@ -20,6 +20,12 @@
     "mousekey": false,
     "extrakey": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "community_layouts": ["ortho_4x12"],
   "layouts": {
     "LAYOUT_ortho_4x12": {
diff --git a/keyboards/evyd13/wasdat/info.json b/keyboards/evyd13/wasdat/keyboard.json
index 109e033532..109e033532 100644
--- a/keyboards/evyd13/wasdat/info.json
+++ b/keyboards/evyd13/wasdat/keyboard.json
diff --git a/keyboards/evyd13/wasdat_code/info.json b/keyboards/evyd13/wasdat_code/keyboard.json
index 8c1bb52b6b..8c1bb52b6b 100644
--- a/keyboards/evyd13/wasdat_code/info.json
+++ b/keyboards/evyd13/wasdat_code/keyboard.json
diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/keyboard.json
index 917780d3a9..917780d3a9 100644
--- a/keyboards/ez_maker/directpins/teensy_32/info.json
+++ b/keyboards/ez_maker/directpins/teensy_32/keyboard.json
diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/keyboard.json
index 53e7ba3974..53e7ba3974 100644
--- a/keyboards/ez_maker/directpins/teensy_lc/info.json
+++ b/keyboards/ez_maker/directpins/teensy_lc/keyboard.json