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/mlego/m65/rev1/info.json | 4 +++- keyboards/mlego/m65/rev1/rules.mk | 6 ------ keyboards/mlego/m65/rev2/info.json | 4 +++- keyboards/mlego/m65/rev2/rules.mk | 6 ------ keyboards/mlego/m65/rev3/info.json | 5 ++++- keyboards/mlego/m65/rev3/rules.mk | 8 -------- keyboards/mlego/m65/rev4/info.json | 5 ++++- keyboards/mlego/m65/rev4/rules.mk | 8 -------- 8 files changed, 14 insertions(+), 32 deletions(-) (limited to 'keyboards/mlego/m65') diff --git a/keyboards/mlego/m65/rev1/info.json b/keyboards/mlego/m65/rev1/info.json index e495c94992..553fe3b7d2 100644 --- a/keyboards/mlego/m65/rev1/info.json +++ b/keyboards/mlego/m65/rev1/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x6061", "device_version": "0.0.1" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino" } diff --git a/keyboards/mlego/m65/rev1/rules.mk b/keyboards/mlego/m65/rev1/rules.mk index 5e456c2606..fa351eadba 100644 --- a/keyboards/mlego/m65/rev1/rules.mk +++ b/keyboards/mlego/m65/rev1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m65/rev2/info.json b/keyboards/mlego/m65/rev2/info.json index 470262ed85..3e6ef2d0bc 100644 --- a/keyboards/mlego/m65/rev2/info.json +++ b/keyboards/mlego/m65/rev2/info.json @@ -2,5 +2,7 @@ "usb": { "pid": "0x6061", "device_version": "0.0.2" - } + }, + "processor": "STM32F103", // GD32F303CCT6 + "bootloader": "stm32duino" } diff --git a/keyboards/mlego/m65/rev2/rules.mk b/keyboards/mlego/m65/rev2/rules.mk index 1b7c586b71..51070f9718 100644 --- a/keyboards/mlego/m65/rev2/rules.mk +++ b/keyboards/mlego/m65/rev2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F103 #GD32F303CCT6 weact - -# Bootloader selection -BOOTLOADER = stm32duino - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m65/rev3/info.json b/keyboards/mlego/m65/rev3/info.json index e42ab50857..cf330be7c9 100644 --- a/keyboards/mlego/m65/rev3/info.json +++ b/keyboards/mlego/m65/rev3/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6062", "device_version": "0.0.1" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m65/rev3/rules.mk b/keyboards/mlego/m65/rev3/rules.mk index 57908335fd..fa351eadba 100644 --- a/keyboards/mlego/m65/rev3/rules.mk +++ b/keyboards/mlego/m65/rev3/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/mlego/m65/rev4/info.json b/keyboards/mlego/m65/rev4/info.json index c94ea38e22..dee2b86933 100644 --- a/keyboards/mlego/m65/rev4/info.json +++ b/keyboards/mlego/m65/rev4/info.json @@ -2,5 +2,8 @@ "usb": { "pid": "0x6062", "device_version": "0.0.2" - } + }, + "processor": "STM32F401", + "bootloader": "tinyuf2", + "board": "BLACKPILL_STM32_F401" } diff --git a/keyboards/mlego/m65/rev4/rules.mk b/keyboards/mlego/m65/rev4/rules.mk index a16dbefe32..bf9405e1d1 100644 --- a/keyboards/mlego/m65/rev4/rules.mk +++ b/keyboards/mlego/m65/rev4/rules.mk @@ -1,11 +1,3 @@ -# MCU name -MCU = STM32F401 -BOARD = BLACKPILL_STM32_F401 - -# Bootloader selection -BOOTLOADER = tinyuf2 -#BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # -- cgit v1.2.3