diff options
| author | Joel Challis <git@zvecr.com> | 2023-03-18 21:19:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 21:19:26 +0000 |
| commit | 50cb8a3bf5ec3b6229af882e6a1367d4aedd3f53 (patch) | |
| tree | 87467756e06e883726fcd024260ea08ed5907847 /keyboards/doio | |
| parent | 2c19e5d1c3361dbbde04c53df79f02bfcbeb08b3 (diff) | |
Remove bootloader logic from `mcu_selection.mk` (#20150)
* Remove bootloader logic from mcu_selection.mk
* Move MCU/BOOTLOADER to info.json
Diffstat (limited to 'keyboards/doio')
| -rw-r--r-- | keyboards/doio/kb16/rev2/info.json | 2 | ||||
| -rw-r--r-- | keyboards/doio/kb16/rev2/rules.mk | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/info.json index c208bec1bf..6e90528e0f 100644 --- a/keyboards/doio/kb16/rev2/info.json +++ b/keyboards/doio/kb16/rev2/info.json @@ -20,6 +20,8 @@ {"pin_a": "A3", "pin_b": "A4"} ] }, + "processor": "STM32F103", + "bootloader": "stm32duino", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/doio/kb16/rev2/rules.mk b/keyboards/doio/kb16/rev2/rules.mk index 7fa9b91da0..f1f486f639 100644 --- a/keyboards/doio/kb16/rev2/rules.mk +++ b/keyboards/doio/kb16/rev2/rules.mk @@ -1,18 +1,8 @@ SRC += ./lib/layer_status/layer_status.c SRC += ./lib/logo.c -# 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 |