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/bastardkb/tbkmini/blackpill/info.json | 5 ++++- keyboards/bastardkb/tbkmini/blackpill/rules.mk | 7 ------- keyboards/bastardkb/tbkmini/v1/elitec/info.json | 4 +++- keyboards/bastardkb/tbkmini/v1/elitec/rules.mk | 6 ------ keyboards/bastardkb/tbkmini/v2/elitec/info.json | 4 +++- keyboards/bastardkb/tbkmini/v2/elitec/rules.mk | 6 ------ keyboards/bastardkb/tbkmini/v2/splinky_2/info.json | 4 +++- keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk | 6 ------ keyboards/bastardkb/tbkmini/v2/splinky_3/info.json | 4 +++- keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk | 6 ------ keyboards/bastardkb/tbkmini/v2/stemcell/info.json | 4 +++- keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk | 5 ----- 12 files changed, 19 insertions(+), 42 deletions(-) (limited to 'keyboards/bastardkb/tbkmini') diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json index 24664f13ef..025b442468 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/info.json @@ -2,5 +2,8 @@ "keyboard_name": "TBK Mini Blackpill", "usb": { "device_version": "1.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "board": "BLACKPILL_STM32_F411" } diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk index cf2041ea1c..b68437c19e 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk +++ b/keyboards/bastardkb/tbkmini/blackpill/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F411 -BOARD = BLACKPILL_STM32_F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json index f9ebb18069..51fc9a9a54 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "TBK Mini Elite-C", "usb": { "device_version": "1.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk index 0c131a2eaf..985f9489c2 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v1/elitec/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/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json index a0ef2767f9..83964b727f 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json @@ -2,5 +2,7 @@ "keyboard_name": "TBK Mini Elite-C", "usb": { "device_version": "2.0.0" - } + }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu" } diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk index 0c131a2eaf..985f9489c2 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/elitec/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/bastardkb/tbkmini/v2/splinky_2/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json index b0b05fba8a..63b44040ae 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "TBK Mini Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk index 8dfc0256ab..8e2235ee9f 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json index b0b05fba8a..63b44040ae 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/info.json @@ -2,5 +2,7 @@ "keyboard_name": "TBK Mini Splinky", "usb": { "device_version": "2.0.0" - } + }, + "processor": "RP2040", + "bootloader": "rp2040" } diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk index 8dfc0256ab..8e2235ee9f 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # RP2040-specific options ALLOW_WARNINGS = yes PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json index 7595dab436..a07d65bdd3 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json @@ -2,5 +2,7 @@ "keyboard_name": "TBK Mini STeMCell", "usb": { "device_version": "2.0.0" - } + }, + "processor": "STM32F411", + "bootloader": "stm32-dfu" } diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk index 39fc183e1d..70f7784de6 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk @@ -1,8 +1,3 @@ -# MCU name -MCU = STM32F411 - -# Bootloader selection -BOOTLOADER = stm32-dfu CONVERT_TO = stemcell # Build Options -- cgit v1.2.3