6 files changed, 10 insertions, 27 deletions
diff --git a/keyboards/sam/s80/config.h b/keyboards/sam/s80/config.h
index 2968ea1d20..0a235bd36c 100644
--- a/keyboards/sam/s80/config.h
+++ b/keyboards/sam/s80/config.h
@@ -16,11 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 11
-#define MATRIX_COLS 9
 
 /*
  * Keyboard Matrix Assignments
@@ -37,10 +32,6 @@
 
 #define DIODE_DIRECTION ROW2COL
 
-#define BACKLIGHT_PIN B6
-// #define BACKLIGHT_BREATHING
-#define BACKLIGHT_LEVELS 3
-
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #    define RGBLED_NUM 20
diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json
index 6dd583ddd6..ab0cde43a1 100644
--- a/keyboards/sam/s80/info.json
+++ b/keyboards/sam/s80/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3830",
         "device_version": "0.0.1"
     },
+    "backlight": {
+        "pin": "B6"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/sam/s80/rules.mk b/keyboards/sam/s80/rules.mk
index b27013f863..3d5cb57ad5 100644
--- a/keyboards/sam/s80/rules.mk
+++ b/keyboards/sam/s80/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/sam/sg81m/config.h b/keyboards/sam/sg81m/config.h
index e1debea5e8..7cfba55dc8 100644
--- a/keyboards/sam/sg81m/config.h
+++ b/keyboards/sam/sg81m/config.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 14
-#define LED_CAPS_LOCK_PIN B0
 /*
  * Keyboard Matrix Assignments
  *
diff --git a/keyboards/sam/sg81m/info.json b/keyboards/sam/sg81m/info.json
index 59561a84f3..ebf5dda947 100644
--- a/keyboards/sam/sg81m/info.json
+++ b/keyboards/sam/sg81m/info.json
@@ -8,6 +8,11 @@
         "pid": "0x3831",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B0"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_7u_space": {
             "layout": [
diff --git a/keyboards/sam/sg81m/rules.mk b/keyboards/sam/sg81m/rules.mk
index b860eb1332..2626cca929 100644
--- a/keyboards/sam/sg81m/rules.mk
+++ b/keyboards/sam/sg81m/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #