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/rocketboard_16/info.json | 2 ++ keyboards/rocketboard_16/rules.mk | 15 ++------------- 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'keyboards/rocketboard_16') diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json index 59203f1e53..f5dc1bea95 100644 --- a/keyboards/rocketboard_16/info.json +++ b/keyboards/rocketboard_16/info.json @@ -8,6 +8,8 @@ "pid": "0xFF16", "device_version": "0.0.1" }, + "processor": "STM32F103", + "bootloader": "stm32duino", "matrix_pins": { "cols": ["B8", "B9", "B10", "B11"], "rows": ["A9", "B13", "B14", "B15", "B3"] diff --git a/keyboards/rocketboard_16/rules.mk b/keyboards/rocketboard_16/rules.mk index c07ebff427..dd493f5f18 100644 --- a/keyboards/rocketboard_16/rules.mk +++ b/keyboards/rocketboard_16/rules.mk @@ -1,16 +1,5 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -# BOOTLOADER = stm32duino - -# Custom loader configuration -MCU_LDSCRIPT = STM32F103xB_stm32duino_bootloader -OPT_DEFS += -DBOOTLOADER_STM32DUINO -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 # Extra include SRC += keycode_lookup.c -- cgit v1.2.3