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/linworks/dolice/info.json | 2 ++ keyboards/linworks/dolice/rules.mk | 6 ------ keyboards/linworks/fave104/info.json | 2 ++ keyboards/linworks/fave104/rules.mk | 6 ------ keyboards/linworks/fave65h/info.json | 2 ++ keyboards/linworks/fave65h/rules.mk | 6 ------ keyboards/linworks/fave84h/info.json | 2 ++ keyboards/linworks/fave84h/rules.mk | 6 ------ keyboards/linworks/fave87/info.json | 2 ++ keyboards/linworks/fave87/rules.mk | 6 ------ keyboards/linworks/fave87h/info.json | 2 ++ keyboards/linworks/fave87h/rules.mk | 6 ------ keyboards/linworks/whale75/info.json | 3 +++ keyboards/linworks/whale75/rules.mk | 7 ------- 14 files changed, 15 insertions(+), 43 deletions(-) (limited to 'keyboards/linworks') diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json index 4cc1a71a55..be1decf4f5 100644 --- a/keyboards/linworks/dolice/info.json +++ b/keyboards/linworks/dolice/info.json @@ -7,6 +7,8 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_alice": { "layout": [ diff --git a/keyboards/linworks/dolice/rules.mk b/keyboards/linworks/dolice/rules.mk index a3d10eaaaa..477fb5989c 100644 --- a/keyboards/linworks/dolice/rules.mk +++ b/keyboards/linworks/dolice/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/linworks/fave104/info.json b/keyboards/linworks/fave104/info.json index f675f8c51f..8e64093fa4 100644 --- a/keyboards/linworks/fave104/info.json +++ b/keyboards/linworks/fave104/info.json @@ -8,6 +8,8 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/linworks/fave104/rules.mk b/keyboards/linworks/fave104/rules.mk index 296105bb2b..af31ae9eca 100644 --- a/keyboards/linworks/fave104/rules.mk +++ b/keyboards/linworks/fave104/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/fave65h/info.json b/keyboards/linworks/fave65h/info.json index 480a778e6e..c04eb5644b 100644 --- a/keyboards/linworks/fave65h/info.json +++ b/keyboards/linworks/fave65h/info.json @@ -8,6 +8,8 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_65_ansi_blocker_split_bs", "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs" diff --git a/keyboards/linworks/fave65h/rules.mk b/keyboards/linworks/fave65h/rules.mk index cd0eb1ee64..f876ea8a18 100644 --- a/keyboards/linworks/fave65h/rules.mk +++ b/keyboards/linworks/fave65h/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json index 4447c404f8..38af8fb3eb 100644 --- a/keyboards/linworks/fave84h/info.json +++ b/keyboards/linworks/fave84h/info.json @@ -8,6 +8,8 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": [ "tkl_ansi_tsangan" ], diff --git a/keyboards/linworks/fave84h/rules.mk b/keyboards/linworks/fave84h/rules.mk index c3ddbe4252..87ea6a36c2 100644 --- a/keyboards/linworks/fave84h/rules.mk +++ b/keyboards/linworks/fave84h/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/fave87/info.json b/keyboards/linworks/fave87/info.json index 8b01d89c03..dffb86c8ec 100644 --- a/keyboards/linworks/fave87/info.json +++ b/keyboards/linworks/fave87/info.json @@ -7,6 +7,8 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/linworks/fave87/rules.mk b/keyboards/linworks/fave87/rules.mk index 216713b44b..dd1bb7c54f 100644 --- a/keyboards/linworks/fave87/rules.mk +++ b/keyboards/linworks/fave87/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/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json index b6a836e0ec..1746353c26 100644 --- a/keyboards/linworks/fave87h/info.json +++ b/keyboards/linworks/fave87h/info.json @@ -8,6 +8,8 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT": "LAYOUT_tkl_ansi_split_bs" }, diff --git a/keyboards/linworks/fave87h/rules.mk b/keyboards/linworks/fave87h/rules.mk index cd0eb1ee64..f876ea8a18 100644 --- a/keyboards/linworks/fave87h/rules.mk +++ b/keyboards/linworks/fave87h/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/linworks/whale75/info.json b/keyboards/linworks/whale75/info.json index 1f6c3cdf14..30d9352f73 100644 --- a/keyboards/linworks/whale75/info.json +++ b/keyboards/linworks/whale75/info.json @@ -7,6 +7,9 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/linworks/whale75/rules.mk b/keyboards/linworks/whale75/rules.mk index adad6ab5d2..bd6499b239 100644 --- a/keyboards/linworks/whale75/rules.mk +++ b/keyboards/linworks/whale75/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3