From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 8 Feb 2023 18:41:46 +1100
Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)

---
 keyboards/salicylic_acid3/7skb/rev1/info.json      | 2 ++
 keyboards/salicylic_acid3/7skb/rules.mk            | 6 ------
 keyboards/salicylic_acid3/7splus/info.json         | 2 ++
 keyboards/salicylic_acid3/7splus/rules.mk          | 6 ------
 keyboards/salicylic_acid3/ajisai74/info.json       | 2 ++
 keyboards/salicylic_acid3/ajisai74/rules.mk        | 6 ------
 keyboards/salicylic_acid3/ergoarrows/info.json     | 2 ++
 keyboards/salicylic_acid3/ergoarrows/rules.mk      | 6 ------
 keyboards/salicylic_acid3/getta25/rev1/info.json   | 2 ++
 keyboards/salicylic_acid3/getta25/rules.mk         | 6 ------
 keyboards/salicylic_acid3/jisplit89/rev1/info.json | 2 ++
 keyboards/salicylic_acid3/jisplit89/rules.mk       | 6 ------
 keyboards/salicylic_acid3/nafuda/info.json         | 2 ++
 keyboards/salicylic_acid3/nafuda/rules.mk          | 6 ------
 keyboards/salicylic_acid3/naked48/rev1/info.json   | 2 ++
 keyboards/salicylic_acid3/naked48/rules.mk         | 6 ------
 keyboards/salicylic_acid3/naked60/rev1/info.json   | 2 ++
 keyboards/salicylic_acid3/naked60/rules.mk         | 6 ------
 keyboards/salicylic_acid3/naked64/rev1/info.json   | 2 ++
 keyboards/salicylic_acid3/naked64/rules.mk         | 6 ------
 keyboards/salicylic_acid3/nknl7en/info.json        | 2 ++
 keyboards/salicylic_acid3/nknl7en/rules.mk         | 6 ------
 keyboards/salicylic_acid3/nknl7jp/info.json        | 2 ++
 keyboards/salicylic_acid3/nknl7jp/rules.mk         | 6 ------
 keyboards/salicylic_acid3/setta21/rev1/info.json   | 2 ++
 keyboards/salicylic_acid3/setta21/rules.mk         | 6 ------
 26 files changed, 26 insertions(+), 78 deletions(-)

(limited to 'keyboards/salicylic_acid3')

diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json
index 7bd508ed7f..5627a14367 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/info.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/info.json
@@ -8,6 +8,8 @@
         "pid": "0xEB5F",
         "device_version": "0.0.7"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk
index dc0a7dfb49..171b119b34 100644
--- a/keyboards/salicylic_acid3/7skb/rules.mk
+++ b/keyboards/salicylic_acid3/7skb/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
index aa70fe150a..2ad447bc9f 100644
--- a/keyboards/salicylic_acid3/7splus/info.json
+++ b/keyboards/salicylic_acid3/7splus/info.json
@@ -8,6 +8,8 @@
         "pid": "0xEAE7",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/7splus/rules.mk b/keyboards/salicylic_acid3/7splus/rules.mk
index b0a2799e4b..124c57ba15 100644
--- a/keyboards/salicylic_acid3/7splus/rules.mk
+++ b/keyboards/salicylic_acid3/7splus/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json
index c0e5c2b5c0..f1164b66b0 100644
--- a/keyboards/salicylic_acid3/ajisai74/info.json
+++ b/keyboards/salicylic_acid3/ajisai74/info.json
@@ -8,6 +8,8 @@
         "pid": "0xEB54",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/ajisai74/rules.mk b/keyboards/salicylic_acid3/ajisai74/rules.mk
index 8f9772df22..8ea05b5f74 100644
--- a/keyboards/salicylic_acid3/ajisai74/rules.mk
+++ b/keyboards/salicylic_acid3/ajisai74/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
index 2c741c21e9..fccfe217af 100644
--- a/keyboards/salicylic_acid3/ergoarrows/info.json
+++ b/keyboards/salicylic_acid3/ergoarrows/info.json
@@ -8,6 +8,8 @@
         "pid": "0xEA54",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/ergoarrows/rules.mk b/keyboards/salicylic_acid3/ergoarrows/rules.mk
index aba3644c9e..a876de5b53 100644
--- a/keyboards/salicylic_acid3/ergoarrows/rules.mk
+++ b/keyboards/salicylic_acid3/ergoarrows/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json
index 23354552ea..7443540704 100644
--- a/keyboards/salicylic_acid3/getta25/rev1/info.json
+++ b/keyboards/salicylic_acid3/getta25/rev1/info.json
@@ -8,6 +8,8 @@
         "pid": "0x3060",
         "device_version": "0.1.3"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk
index 977ef5bb1d..dae9b6ae3b 100644
--- a/keyboards/salicylic_acid3/getta25/rules.mk
+++ b/keyboards/salicylic_acid3/getta25/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
index 1279d2475e..527d2544e7 100644
--- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json
+++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json
@@ -8,6 +8,8 @@
         "pid": "0xEB4F",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk
index a6a8510675..a496323b5d 100644
--- a/keyboards/salicylic_acid3/jisplit89/rules.mk
+++ b/keyboards/salicylic_acid3/jisplit89/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json
index 822ee9e0a1..05cf322ccf 100644
--- a/keyboards/salicylic_acid3/nafuda/info.json
+++ b/keyboards/salicylic_acid3/nafuda/info.json
@@ -8,6 +8,8 @@
         "pid": "0x3060",
         "device_version": "0.1.2"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/nafuda/rules.mk b/keyboards/salicylic_acid3/nafuda/rules.mk
index e9d90e7ad8..84e129e63b 100644
--- a/keyboards/salicylic_acid3/nafuda/rules.mk
+++ b/keyboards/salicylic_acid3/nafuda/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/naked48/rev1/info.json b/keyboards/salicylic_acid3/naked48/rev1/info.json
index fd4639c5cc..154b258713 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked48/rev1/info.json
@@ -8,6 +8,8 @@
         "pid": "0xE8BA",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
index 0e297ebf60..956ae2cefc 100644
--- a/keyboards/salicylic_acid3/naked48/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/naked60/rev1/info.json b/keyboards/salicylic_acid3/naked60/rev1/info.json
index 30b1def9aa..a40a2f8814 100644
--- a/keyboards/salicylic_acid3/naked60/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked60/rev1/info.json
@@ -8,6 +8,8 @@
         "pid": "0xEB5C",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk
index 1aefc7b595..e4bce8739b 100644
--- a/keyboards/salicylic_acid3/naked60/rules.mk
+++ b/keyboards/salicylic_acid3/naked60/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/naked64/rev1/info.json b/keyboards/salicylic_acid3/naked64/rev1/info.json
index c8fe578271..b3119d2d46 100644
--- a/keyboards/salicylic_acid3/naked64/rev1/info.json
+++ b/keyboards/salicylic_acid3/naked64/rev1/info.json
@@ -8,6 +8,8 @@
         "pid": "0x3060",
         "device_version": "0.0.3"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk
index db027e3bda..70e97d797d 100644
--- a/keyboards/salicylic_acid3/naked64/rules.mk
+++ b/keyboards/salicylic_acid3/naked64/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
index 6c94b5deb6..a8c64be583 100644
--- a/keyboards/salicylic_acid3/nknl7en/info.json
+++ b/keyboards/salicylic_acid3/nknl7en/info.json
@@ -8,6 +8,8 @@
         "pid": "0xEA56",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/nknl7en/rules.mk b/keyboards/salicylic_acid3/nknl7en/rules.mk
index aba3644c9e..a876de5b53 100644
--- a/keyboards/salicylic_acid3/nknl7en/rules.mk
+++ b/keyboards/salicylic_acid3/nknl7en/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
index 1750c19dba..8cddd5b060 100644
--- a/keyboards/salicylic_acid3/nknl7jp/info.json
+++ b/keyboards/salicylic_acid3/nknl7jp/info.json
@@ -8,6 +8,8 @@
         "pid": "0xEA55",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/salicylic_acid3/nknl7jp/rules.mk b/keyboards/salicylic_acid3/nknl7jp/rules.mk
index aba3644c9e..a876de5b53 100644
--- a/keyboards/salicylic_acid3/nknl7jp/rules.mk
+++ b/keyboards/salicylic_acid3/nknl7jp/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/salicylic_acid3/setta21/rev1/info.json b/keyboards/salicylic_acid3/setta21/rev1/info.json
index e9b0521676..a798c25e63 100644
--- a/keyboards/salicylic_acid3/setta21/rev1/info.json
+++ b/keyboards/salicylic_acid3/setta21/rev1/info.json
@@ -8,6 +8,8 @@
         "pid": "0x3060",
         "device_version": "0.1.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "community_layouts": ["numpad_6x4"],
     "layouts": {
         "LAYOUT_numpad_6x4": {
diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk
index dfe0d96760..ee8bd4cc40 100644
--- a/keyboards/salicylic_acid3/setta21/rules.mk
+++ b/keyboards/salicylic_acid3/setta21/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
-- 
cgit v1.2.3