8 files changed, 20 insertions, 17 deletions
diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h
index af98f887db..74bb00edc2 100644
--- a/keyboards/tzarc/djinn/config.h
+++ b/keyboards/tzarc/djinn/config.h
@@ -11,12 +11,6 @@
 
 // Split configuration
 #define SPLIT_TRANSACTION_IDS_KB RPC_ID_SYNC_STATE_KB
-#define SPLIT_TRANSPORT_MIRROR
-#define SPLIT_LAYER_STATE_ENABLE
-#define SPLIT_LED_STATE_ENABLE
-#define SPLIT_MODS_ENABLE
-#define SPLIT_WPM_ENABLE
-#define SPLIT_ACTIVITY_ENABLE
 
 // SPI Configuration
 #define SPI_DRIVER SPID3
diff --git a/keyboards/tzarc/djinn/info.json b/keyboards/tzarc/djinn/info.json
index f0904b8578..64ed1da690 100644
--- a/keyboards/tzarc/djinn/info.json
+++ b/keyboards/tzarc/djinn/info.json
@@ -9,6 +9,9 @@
   "build": {
     "lto": true
   },
+  "eeprom": {
+    "driver": "spi"
+  },
   "features": {
     "audio": true,
     "backlight": true,
@@ -42,13 +45,22 @@
   },
   "split": {
     "enabled": true,
-    "main": "pin",
     "encoder": {
       "right": {
         "rotary": [
           {"pin_a": "C15", "pin_b": "C14", "resolution": 2}
         ]
       }
+    },
+    "transport": {
+      "sync": {
+          "activity": true,
+          "indicators": true,
+          "layer_state": true,
+          "matrix_state": true,
+          "modifiers": true,
+          "wpm": true
+      }
     }
   },
   "encoder": {
diff --git a/keyboards/tzarc/djinn/rev1/config.h b/keyboards/tzarc/djinn/rev1/config.h
index 5dffc00141..cdcabed05c 100644
--- a/keyboards/tzarc/djinn/rev1/config.h
+++ b/keyboards/tzarc/djinn/rev1/config.h
@@ -22,7 +22,6 @@
 #define RGB_CURR_3000mA_OK_PIN C5
 
 // EEPROM configuration
+#define EEPROM_SPI_MB85RS64V
 #define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN B5
 #define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 8 // (160MHz/8) => 20MHz
-#define EXTERNAL_EEPROM_BYTE_COUNT 8192
-#define EXTERNAL_EEPROM_PAGE_SIZE 64 // it's FRAM, so it doesn't actually matter, this just sets the RAM buffer size
diff --git a/keyboards/tzarc/djinn/rev2/config.h b/keyboards/tzarc/djinn/rev2/config.h
index 12a6372405..00a893ff65 100644
--- a/keyboards/tzarc/djinn/rev2/config.h
+++ b/keyboards/tzarc/djinn/rev2/config.h
@@ -25,10 +25,9 @@
 #define RGB_CURR_3000mA_OK_PIN C4
 
 // EEPROM configuration
+#define EEPROM_SPI_MB85RS64V
 #define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN B5
 #define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR 8 // (160MHz/8) => 20MHz
-#define EXTERNAL_EEPROM_BYTE_COUNT 8192
-#define EXTERNAL_EEPROM_PAGE_SIZE 64 // it's FRAM, so it doesn't actually matter, this just sets the RAM buffer size
 
 // External flash config
 #define EXTERNAL_FLASH_SPI_MODE 3
diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk
index e7c32e4dc1..5a4589a86f 100644
--- a/keyboards/tzarc/djinn/rules.mk
+++ b/keyboards/tzarc/djinn/rules.mk
@@ -4,8 +4,6 @@ SERIAL_DRIVER = usart
 
 CIE1931_CURVE = yes
 
-EEPROM_DRIVER = spi
-
 AUDIO_DRIVER = pwm_software
 
 QUANTUM_PAINTER_DRIVERS = ili9341_spi
diff --git a/keyboards/tzarc/ghoul/config.h b/keyboards/tzarc/ghoul/config.h
index 932ea8eb50..402f14cd92 100644
--- a/keyboards/tzarc/ghoul/config.h
+++ b/keyboards/tzarc/ghoul/config.h
@@ -8,8 +8,7 @@
 // #define MATRIX_COLS 8 // actually defined in info.json: 8 bits per register
 
 // EEPROM configuration
-#define EXTERNAL_EEPROM_BYTE_COUNT 8192
-#define EXTERNAL_EEPROM_PAGE_SIZE 64 // it's FRAM, so it doesn't actually matter, this just sets the RAM buffer
+#define EEPROM_SPI_MB85RS64V
 
 // RGB configuration
 #define RGB_MATRIX_LED_COUNT 40
diff --git a/keyboards/tzarc/ghoul/info.json b/keyboards/tzarc/ghoul/info.json
index bf07f122c3..26824ca4da 100644
--- a/keyboards/tzarc/ghoul/info.json
+++ b/keyboards/tzarc/ghoul/info.json
@@ -5,6 +5,9 @@
   "build": {
     "lto": true
   },
+  "eeprom": {
+    "driver": "spi"
+  },
   "features": {
     "bootmagic": true,
     "console": true,
diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk
index 9590c52217..4bf96d9824 100644
--- a/keyboards/tzarc/ghoul/rules.mk
+++ b/keyboards/tzarc/ghoul/rules.mk
@@ -1,7 +1,6 @@
 CUSTOM_MATRIX = lite
-EEPROM_DRIVER = spi
 QUANTUM_PAINTER_DRIVERS = ssd1351_spi
 
 DEFAULT_FOLDER = tzarc/ghoul/rev1/stm32
 
-SRC += analog.c
+ANALOG_DRIVER_REQUIRED = yes