From 50cb8a3bf5ec3b6229af882e6a1367d4aedd3f53 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 18 Mar 2023 21:19:26 +0000 Subject: Remove bootloader logic from `mcu_selection.mk` (#20150) * Remove bootloader logic from mcu_selection.mk * Move MCU/BOOTLOADER to info.json --- keyboards/phage_studio/pila87/info.json | 2 ++ keyboards/phage_studio/pila87/rules.mk | 14 ++------------ 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'keyboards/phage_studio') diff --git a/keyboards/phage_studio/pila87/info.json b/keyboards/phage_studio/pila87/info.json index 59191d61d5..a64e5c5074 100644 --- a/keyboards/phage_studio/pila87/info.json +++ b/keyboards/phage_studio/pila87/info.json @@ -8,6 +8,8 @@ "pid": "0x5887", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "matrix_pins": { "cols": ["B5", "B4", "B6", "C0", "C1", "C2", "C3", "B7", "B3", "D2", "C12", "C11", "C10", "A15", "C15", "C13", "A3"], "rows": ["A1", "A2", "A10", "A9", "A8", "C9"] diff --git a/keyboards/phage_studio/pila87/rules.mk b/keyboards/phage_studio/pila87/rules.mk index ffe0bc9f39..a204b2aa9e 100644 --- a/keyboards/phage_studio/pila87/rules.mk +++ b/keyboards/phage_studio/pila87/rules.mk @@ -1,15 +1,5 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -# Cannot use `BOOTLOADER = stm32duino` due to the need to override -# `MCU_LDSCRIPT`, therefore all parameters need to be specified here manually. -OPT_DEFS += -DBOOTLOADER_STM32DUINO -MCU_LDSCRIPT = STM32F103xB_stm32duino_bootloader -BOARD = STM32_F103_STM32DUINO -BOOTLOADER_TYPE = stm32duino -DFU_ARGS = -d 1EAF:0003 -a 2 -R -DFU_SUFFIX_ARGS = -v 1EAF -p 0003 +# Configure for 128K flash +MCU_LDSCRIPT = STM32F103xB # Build Options # change yes to no to disable -- cgit v1.2.3