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/ghs/rar/info.json | 2 ++ keyboards/ghs/rar/rules.mk | 6 ------ keyboards/ghs/xls/info.json | 2 ++ keyboards/ghs/xls/rules.mk | 6 ------ 4 files changed, 4 insertions(+), 12 deletions(-) (limited to 'keyboards/ghs') diff --git a/keyboards/ghs/rar/info.json b/keyboards/ghs/rar/info.json index 2f5a75a4f4..1a8b534e56 100644 --- a/keyboards/ghs/rar/info.json +++ b/keyboards/ghs/rar/info.json @@ -8,6 +8,8 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ghs/rar/rules.mk b/keyboards/ghs/rar/rules.mk index 4c9451f9a1..8288dff376 100644 --- a/keyboards/ghs/rar/rules.mk +++ b/keyboards/ghs/rar/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/ghs/xls/info.json b/keyboards/ghs/xls/info.json index 6530893229..87ed376500 100644 --- a/keyboards/ghs/xls/info.json +++ b/keyboards/ghs/xls/info.json @@ -25,6 +25,8 @@ "pid": "0x0002", "vid": "0x0645" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "encoder": { "rotary": [ { "pin_a": "B3", "pin_b": "A15" }, diff --git a/keyboards/ghs/xls/rules.mk b/keyboards/ghs/xls/rules.mk index 6b37928327..a92b099328 100644 --- a/keyboards/ghs/xls/rules.mk +++ b/keyboards/ghs/xls/rules.mk @@ -1,8 +1,2 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -- cgit v1.2.3