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/ferris/0_1/info.json | 4 +++- keyboards/ferris/0_1/rules.mk | 6 ------ keyboards/ferris/0_2/info.json | 4 +++- keyboards/ferris/0_2/rules.mk | 6 ------ keyboards/ferris/sweep/info.json | 4 +++- keyboards/ferris/sweep/rules.mk | 6 ------ 6 files changed, 9 insertions(+), 21 deletions(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json index 354545b3bd..c3a9971bae 100644 --- a/keyboards/ferris/0_1/info.json +++ b/keyboards/ferris/0_1/info.json @@ -5,5 +5,7 @@ "vid": "0xC2AB", "pid": "0x0000", "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk index 86db6e4d12..487375928e 100644 --- a/keyboards/ferris/0_1/rules.mk +++ b/keyboards/ferris/0_1/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/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json index 9ab2ffbdfb..c0f7b92dfa 100644 --- a/keyboards/ferris/0_2/info.json +++ b/keyboards/ferris/0_2/info.json @@ -3,5 +3,7 @@ "usb": { "vid": "0xC2AB", "device_version": "0.0.2" - } + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu" } diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk index 3573b57459..f3760b7b62 100644 --- a/keyboards/ferris/0_2/rules.mk +++ b/keyboards/ferris/0_2/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/ferris/sweep/info.json b/keyboards/ferris/sweep/info.json index fc53028c34..b906014d6f 100644 --- a/keyboards/ferris/sweep/info.json +++ b/keyboards/ferris/sweep/info.json @@ -5,5 +5,7 @@ "vid": "0xC2AB", "pid": "0x3939", "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/ferris/sweep/rules.mk b/keyboards/ferris/sweep/rules.mk index 9399838733..ebc2feb78e 100644 --- a/keyboards/ferris/sweep/rules.mk +++ b/keyboards/ferris/sweep/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