summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-03-18 21:19:26 +0000
committerGitHub <noreply@github.com>2023-03-18 21:19:26 +0000
commit50cb8a3bf5ec3b6229af882e6a1367d4aedd3f53 (patch)
tree87467756e06e883726fcd024260ea08ed5907847 /keyboards
parent2c19e5d1c3361dbbde04c53df79f02bfcbeb08b3 (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')
-rw-r--r--keyboards/doio/kb16/rev2/info.json2
-rw-r--r--keyboards/doio/kb16/rev2/rules.mk14
-rw-r--r--keyboards/phage_studio/pila87/info.json2
-rw-r--r--keyboards/phage_studio/pila87/rules.mk14
-rw-r--r--keyboards/rocketboard_16/info.json2
-rw-r--r--keyboards/rocketboard_16/rules.mk15
6 files changed, 12 insertions, 37 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
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
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