From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/rart/rart45/info.json | 2 ++ keyboards/rart/rart45/rules.mk | 6 ------ keyboards/rart/rart4x4/info.json | 2 ++ keyboards/rart/rart4x4/rules.mk | 6 ------ keyboards/rart/rart67/info.json | 2 ++ keyboards/rart/rart67/rules.mk | 6 ------ keyboards/rart/rart67m/info.json | 2 ++ keyboards/rart/rart67m/rules.mk | 6 ------ keyboards/rart/rart75/info.json | 2 ++ keyboards/rart/rart75/rules.mk | 6 ------ keyboards/rart/rart75hs/info.json | 2 ++ keyboards/rart/rart75hs/rules.mk | 6 ------ keyboards/rart/rart75m/info.json | 2 ++ keyboards/rart/rart75m/rules.mk | 6 ------ keyboards/rart/rart80/info.json | 2 ++ keyboards/rart/rart80/rules.mk | 6 ------ keyboards/rart/rartand/info.json | 2 ++ keyboards/rart/rartand/rules.mk | 6 ------ keyboards/rart/rartland/info.json | 2 ++ keyboards/rart/rartland/rules.mk | 6 ------ keyboards/rart/rartlice/info.json | 2 ++ keyboards/rart/rartlice/rules.mk | 6 ------ keyboards/rart/rartlite/info.json | 2 ++ keyboards/rart/rartlite/rules.mk | 6 ------ keyboards/rart/rartpad/info.json | 2 ++ keyboards/rart/rartpad/rules.mk | 6 ------ 26 files changed, 26 insertions(+), 78 deletions(-) (limited to 'keyboards/rart') diff --git a/keyboards/rart/rart45/info.json b/keyboards/rart/rart45/info.json index e0f9986eee..13c8c8e704 100644 --- a/keyboards/rart/rart45/info.json +++ b/keyboards/rart/rart45/info.json @@ -8,6 +8,8 @@ "pid": "0x0045", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart45/rules.mk b/keyboards/rart/rart45/rules.mk index d1dde8af62..ab2c49da70 100644 --- a/keyboards/rart/rart45/rules.mk +++ b/keyboards/rart/rart45/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rart4x4/info.json b/keyboards/rart/rart4x4/info.json index 25f44c02cc..1b01a4d226 100644 --- a/keyboards/rart/rart4x4/info.json +++ b/keyboards/rart/rart4x4/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/rart/rart4x4/rules.mk b/keyboards/rart/rart4x4/rules.mk index b939df9dc1..7e8534dae5 100644 --- a/keyboards/rart/rart4x4/rules.mk +++ b/keyboards/rart/rart4x4/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/rart/rart67/info.json b/keyboards/rart/rart67/info.json index 8e6a1620f8..ea1788f669 100644 --- a/keyboards/rart/rart67/info.json +++ b/keyboards/rart/rart67/info.json @@ -8,6 +8,8 @@ "pid": "0x0067", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart67/rules.mk b/keyboards/rart/rart67/rules.mk index e3b5ed2af1..b483118606 100644 --- a/keyboards/rart/rart67/rules.mk +++ b/keyboards/rart/rart67/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/rart/rart67m/info.json b/keyboards/rart/rart67m/info.json index 6cfd7dcbd6..4db76f2bbb 100644 --- a/keyboards/rart/rart67m/info.json +++ b/keyboards/rart/rart67m/info.json @@ -8,6 +8,8 @@ "pid": "0x6067", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart67m/rules.mk b/keyboards/rart/rart67m/rules.mk index 5677dc377b..9d9090d7ea 100644 --- a/keyboards/rart/rart67m/rules.mk +++ b/keyboards/rart/rart67m/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/rart/rart75/info.json b/keyboards/rart/rart75/info.json index ebb8c4044d..81781cdb7e 100644 --- a/keyboards/rart/rart75/info.json +++ b/keyboards/rart/rart75/info.json @@ -8,6 +8,8 @@ "pid": "0x0075", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart75/rules.mk b/keyboards/rart/rart75/rules.mk index a5f27d5b1a..8feeffc98b 100644 --- a/keyboards/rart/rart75/rules.mk +++ b/keyboards/rart/rart75/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/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json index 43822f71f1..6440868804 100644 --- a/keyboards/rart/rart75hs/info.json +++ b/keyboards/rart/rart75hs/info.json @@ -8,6 +8,8 @@ "pid": "0x5575", "device_version": "0.0.3" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart75hs/rules.mk b/keyboards/rart/rart75hs/rules.mk index 3a9dc7e9bc..804d61435b 100644 --- a/keyboards/rart/rart75hs/rules.mk +++ b/keyboards/rart/rart75hs/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = usbasploader - # Processor frequency F_CPU = 16000000 diff --git a/keyboards/rart/rart75m/info.json b/keyboards/rart/rart75m/info.json index 5ff8da619f..094bb55b8d 100644 --- a/keyboards/rart/rart75m/info.json +++ b/keyboards/rart/rart75m/info.json @@ -8,6 +8,8 @@ "pid": "0x6075", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart75m/rules.mk b/keyboards/rart/rart75m/rules.mk index ffaadf24af..6d03cffdfe 100644 --- a/keyboards/rart/rart75m/rules.mk +++ b/keyboards/rart/rart75m/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/rart/rart80/info.json b/keyboards/rart/rart80/info.json index 9c6c52f33c..f34f16be36 100644 --- a/keyboards/rart/rart80/info.json +++ b/keyboards/rart/rart80/info.json @@ -8,6 +8,8 @@ "pid": "0x0080", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rart80/rules.mk b/keyboards/rart/rart80/rules.mk index 4655675b62..1dfa09e016 100644 --- a/keyboards/rart/rart80/rules.mk +++ b/keyboards/rart/rart80/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32a - -# Bootloader selection -BOOTLOADER = usbasploader - # Processor frequency F_CPU = 16000000 diff --git a/keyboards/rart/rartand/info.json b/keyboards/rart/rartand/info.json index 8faf60cf01..621d7b61bf 100644 --- a/keyboards/rart/rartand/info.json +++ b/keyboards/rart/rartand/info.json @@ -8,6 +8,8 @@ "pid": "0x5050", "device_version": "0.0.1" }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rartand/rules.mk b/keyboards/rart/rartand/rules.mk index 1bef27aa8a..b9cc25d86e 100644 --- a/keyboards/rart/rartand/rules.mk +++ b/keyboards/rart/rartand/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rartland/info.json b/keyboards/rart/rartland/info.json index 5fb569d60a..67e77b90c4 100644 --- a/keyboards/rart/rartland/info.json +++ b/keyboards/rart/rartland/info.json @@ -8,6 +8,8 @@ "pid": "0x6065", "device_version": "0.0.1" }, + "processor": "atmega32a", + "bootloader": "usbasploader", "community_layouts": ["65_ansi", "65_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/rart/rartland/rules.mk b/keyboards/rart/rartland/rules.mk index e4a1dcaeab..06d9ea1b91 100644 --- a/keyboards/rart/rartland/rules.mk +++ b/keyboards/rart/rartland/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32a - # Processor frequency F_CPU = 16000000 -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json index d5e8802ee6..3e06116c80 100644 --- a/keyboards/rart/rartlice/info.json +++ b/keyboards/rart/rartlice/info.json @@ -8,6 +8,8 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rart/rartlice/rules.mk b/keyboards/rart/rartlice/rules.mk index e46ca1a40e..2be366363a 100644 --- a/keyboards/rart/rartlice/rules.mk +++ b/keyboards/rart/rartlice/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/rart/rartlite/info.json b/keyboards/rart/rartlite/info.json index 6403eca743..44a535aac5 100644 --- a/keyboards/rart/rartlite/info.json +++ b/keyboards/rart/rartlite/info.json @@ -8,6 +8,8 @@ "pid": "0x4040", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_right_numpad": { "layout": [ diff --git a/keyboards/rart/rartlite/rules.mk b/keyboards/rart/rartlite/rules.mk index 1145bd5a43..6d3709762d 100644 --- a/keyboards/rart/rartlite/rules.mk +++ b/keyboards/rart/rartlite/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/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json index 38742f3fae..bf1b231544 100644 --- a/keyboards/rart/rartpad/info.json +++ b/keyboards/rart/rartpad/info.json @@ -8,6 +8,8 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { "LAYOUT_ortho_5x4": { diff --git a/keyboards/rart/rartpad/rules.mk b/keyboards/rart/rartpad/rules.mk index 6557114ea6..8c692a7b56 100644 --- a/keyboards/rart/rartpad/rules.mk +++ b/keyboards/rart/rartpad/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