9 files changed, 10 insertions, 17 deletions
diff --git a/keyboards/oddball/config.h b/keyboards/oddball/config.h
index 30e16490c8..e620a91107 100644
--- a/keyboards/oddball/config.h
+++ b/keyboards/oddball/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
 
 /* key matrix size */
 #define MATRIX_ROWS 8
@@ -30,9 +29,6 @@
 #define SPLIT_USB_DETECT
 #define MASTER_RIGHT
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -44,9 +40,5 @@
 #define CPI_2 4000
 #define CPI_3 8000
 
-/* Bootmagic Lite key configuration */
-// #define BOOTMAGIC_LITE_ROW 0
-// #define BOOTMAGIC_LITE_COLUMN 0
-
 #define ADNS9800_CS_PIN SPI_SS_PIN
 #define PMW33XX_CS_PIN SPI_SS_PIN
diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json
index 84e512dbdc..2eaca18e65 100644
--- a/keyboards/oddball/info.json
+++ b/keyboards/oddball/info.json
@@ -8,6 +8,7 @@
         "pid": "0xCA49",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/oddball/rules.mk b/keyboards/oddball/rules.mk
index 4698218128..50c2891bb8 100644
--- a/keyboards/oddball/rules.mk
+++ b/keyboards/oddball/rules.mk
@@ -1,6 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/oddball/v1/info.json b/keyboards/oddball/v1/info.json
new file mode 100644
index 0000000000..66ed86e13c
--- /dev/null
+++ b/keyboards/oddball/v1/info.json
@@ -0,0 +1,3 @@
+{
+    "bootloader": "halfkay"
+}
diff --git a/keyboards/oddball/v1/rules.mk b/keyboards/oddball/v1/rules.mk
index e4320fb125..e69de29bb2 100644
--- a/keyboards/oddball/v1/rules.mk
+++ b/keyboards/oddball/v1/rules.mk
@@ -1,2 +0,0 @@
-# Bootloader selection
-BOOTLOADER = halfkay
diff --git a/keyboards/oddball/v2/info.json b/keyboards/oddball/v2/info.json
new file mode 100644
index 0000000000..cc90702804
--- /dev/null
+++ b/keyboards/oddball/v2/info.json
@@ -0,0 +1,3 @@
+{
+    "bootloader": "qmk-dfu"
+}
diff --git a/keyboards/oddball/v2/rules.mk b/keyboards/oddball/v2/rules.mk
index 8b8ada3d9d..e69de29bb2 100644
--- a/keyboards/oddball/v2/rules.mk
+++ b/keyboards/oddball/v2/rules.mk
@@ -1,2 +0,0 @@
-# Bootloader selection
-BOOTLOADER = qmk-dfu
diff --git a/keyboards/oddball/v2_1/info.json b/keyboards/oddball/v2_1/info.json
new file mode 100644
index 0000000000..cc90702804
--- /dev/null
+++ b/keyboards/oddball/v2_1/info.json
@@ -0,0 +1,3 @@
+{
+    "bootloader": "qmk-dfu"
+}
diff --git a/keyboards/oddball/v2_1/rules.mk b/keyboards/oddball/v2_1/rules.mk
index 8b8ada3d9d..e69de29bb2 100644
--- a/keyboards/oddball/v2_1/rules.mk
+++ b/keyboards/oddball/v2_1/rules.mk
@@ -1,2 +0,0 @@
-# Bootloader selection
-BOOTLOADER = qmk-dfu