6 files changed, 12 insertions, 31 deletions
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index 151c74bc37..eb9850804f 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -13,13 +13,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
-
-#define DIRECT_PINS {{B13, B15, B3, B5}, {B12, B14, A13, B7}}
 
 #define RGBLED_NUM 42
 #define RGB_MATRIX_LED_COUNT 42
@@ -93,11 +86,4 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define WAIT_FOR_USB
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 3
-
-/* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-
 #define TAP_CODE_DELAY 10
diff --git a/keyboards/geekboards/macropad_v2/info.json b/keyboards/geekboards/macropad_v2/info.json
index bac03b43f1..b84877a8dc 100644
--- a/keyboards/geekboards/macropad_v2/info.json
+++ b/keyboards/geekboards/macropad_v2/info.json
@@ -8,6 +8,15 @@
     "pid": "0xA372",
     "device_version": "0.0.2"
   },
+  "processor": "STM32F072",
+  "bootloader": "stm32-dfu",
+  "matrix_pins": {
+    "direct": [
+      ["B13", "B15", "B3", "B5"],
+      ["B12", "B14", "A13", "B7"]
+    ]
+  },
+  "debounce": 3,
   "layouts": {
     "LAYOUT_ortho_2x4": {
       "layout": [
diff --git a/keyboards/geekboards/macropad_v2/rules.mk b/keyboards/geekboards/macropad_v2/rules.mk
index 4aa4ccfdef..f81c11eb7d 100644
--- a/keyboards/geekboards/macropad_v2/rules.mk
+++ b/keyboards/geekboards/macropad_v2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/geekboards/tester/config.h b/keyboards/geekboards/tester/config.h
index c8f3aa4977..0a184388ae 100644
--- a/keyboards/geekboards/tester/config.h
+++ b/keyboards/geekboards/tester/config.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include "config_common.h"
-
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 4
 
 #define MATRIX_ROW_PINS { B0, D4}
 #define MATRIX_COL_PINS { F7, F6, D2, D3}
@@ -12,7 +8,6 @@
 #define LOCKING_SUPPORT_ENABL
 #define LOCKING_RESYNC_ENABLE
 
-#define DEBOUNCE 3
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/geekboards/tester/info.json b/keyboards/geekboards/tester/info.json
index 2da610fb3f..fdc0463e41 100644
--- a/keyboards/geekboards/tester/info.json
+++ b/keyboards/geekboards/tester/info.json
@@ -8,6 +8,9 @@
         "pid": "0x1319",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu",
+    "debounce": 3,
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/geekboards/tester/rules.mk b/keyboards/geekboards/tester/rules.mk
index 923f1f383c..e17c577cc4 100644
--- a/keyboards/geekboards/tester/rules.mk
+++ b/keyboards/geekboards/tester/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
 # Build Options
 #   change yes to no to disable
 #