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/acheron/shark/alpha/info.json | 3 +++ keyboards/acheron/shark/alpha/rules.mk | 7 ------- keyboards/acheron/shark/beta/info.json | 4 +++- keyboards/acheron/shark/beta/rules.mk | 6 ------ 4 files changed, 6 insertions(+), 14 deletions(-) (limited to 'keyboards/acheron/shark') diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/info.json index 94b8834fb2..0db6134e0b 100644 --- a/keyboards/acheron/shark/alpha/info.json +++ b/keyboards/acheron/shark/alpha/info.json @@ -6,6 +6,9 @@ "pid": "0x5368", "device_version": "0.0.1" }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { diff --git a/keyboards/acheron/shark/alpha/rules.mk b/keyboards/acheron/shark/alpha/rules.mk index e3efc0c371..27db06a044 100644 --- a/keyboards/acheron/shark/alpha/rules.mk +++ b/keyboards/acheron/shark/alpha/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 # diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/info.json index e167619485..615e9a91b9 100644 --- a/keyboards/acheron/shark/beta/info.json +++ b/keyboards/acheron/shark/beta/info.json @@ -4,7 +4,9 @@ "pid": "0x5369", "device_version": "0.0.2" }, - "community_layouts": ["ortho_4x12"] + "processor": "STM32F411", + "bootloader": "stm32-dfu", + "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { "layout": [ diff --git a/keyboards/acheron/shark/beta/rules.mk b/keyboards/acheron/shark/beta/rules.mk index 428522a65a..b4a94395c6 100644 --- a/keyboards/acheron/shark/beta/rules.mk +++ b/keyboards/acheron/shark/beta/rules.mk @@ -1,9 +1,3 @@ -MCU = STM32F411 -BOARD = GENERIC_STM32_F411XE - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3