aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-10-13 03:19:50 +1100
committerGitHub <noreply@github.com>2020-10-13 03:19:50 +1100
commitd46b8ef67c91f1794c35a1a91ff9fc7dcba6b009 (patch)
tree1fd8691fb5325f0259d7b955c8de7c4820108ffd
parentadc06c5b3b537f551557dbbd62f43458f6771db0 (diff)
downloadqmk_firmware-d46b8ef67c91f1794c35a1a91ff9fc7dcba6b009.tar.gz
qmk_firmware-d46b8ef67c91f1794c35a1a91ff9fc7dcba6b009.zip
Add STM32Duino to bootloader selection (#10558)
Diffstat
-rw-r--r--bootloader.mk12
-rw-r--r--keyboards/cannonkeys/ortho48/bootloader_defs.h10
-rw-r--r--keyboards/cannonkeys/ortho48/rules.mk8
-rw-r--r--keyboards/cannonkeys/ortho60/bootloader_defs.h10
-rw-r--r--keyboards/cannonkeys/ortho60/rules.mk8
-rw-r--r--keyboards/cannonkeys/ortho75/bootloader_defs.h10
-rw-r--r--keyboards/cannonkeys/ortho75/rules.mk8
-rw-r--r--keyboards/cannonkeys/practice60/bootloader_defs.h10
-rw-r--r--keyboards/cannonkeys/practice60/rules.mk8
-rw-r--r--keyboards/cannonkeys/practice65/bootloader_defs.h10
-rw-r--r--keyboards/cannonkeys/practice65/rules.mk8
-rw-r--r--keyboards/converter/siemens_tastatur/bootloader_defs.h10
-rw-r--r--keyboards/converter/siemens_tastatur/rules.mk8
-rw-r--r--keyboards/handwired/onekey/bluepill/bootloader_defs.h10
-rw-r--r--keyboards/handwired/onekey/bluepill/rules.mk9
-rw-r--r--keyboards/handwired/t111/rules.mk9
-rw-r--r--keyboards/handwired/z150/rules.mk9
-rw-r--r--keyboards/wolfmarkclub/wm1/bootloader_defs.h11
-rw-r--r--keyboards/wolfmarkclub/wm1/rules.mk6
-rw-r--r--keyboards/zvecr/split_blackpill/rules.mk9
20 files changed, 36 insertions, 147 deletions
diff --git a/bootloader.mk b/bootloader.mk
index a7e596e47..ab1ced0ea 100644
--- a/bootloader.mk
+++ b/bootloader.mk
@@ -28,6 +28,7 @@
28# bootloadHID HIDBootFlash compatible (ATmega32A) 28# bootloadHID HIDBootFlash compatible (ATmega32A)
29# USBasp USBaspLoader (ATmega328P) 29# USBasp USBaspLoader (ATmega328P)
30# kiibohd Input:Club Kiibohd bootloader (only used on their boards) 30# kiibohd Input:Club Kiibohd bootloader (only used on their boards)
31# stm32duino STM32Duino (STM32F103x8)
31# 32#
32# BOOTLOADER_SIZE can still be defined manually, but it's recommended 33# BOOTLOADER_SIZE can still be defined manually, but it's recommended
33# you add any possible configuration to this list 34# you add any possible configuration to this list
@@ -106,3 +107,14 @@ ifeq ($(strip $(BOOTLOADER)), kiibohd)
106 DFU_ARGS = -d 1C11:B007 107 DFU_ARGS = -d 1C11:B007
107 DFU_SUFFIX_ARGS = -v 1C11 -p B007 108 DFU_SUFFIX_ARGS = -v 1C11 -p B007
108endif 109endif
110
111ifeq ($(strip $(BOOTLOADER)), stm32duino)
112 OPT_DEFS += -DBOOTLOADER_STM32DUINO
113 MCU_LDSCRIPT ?= STM32F103x8_stm32duino_bootloader
114 BOARD = STM32_F103_STM32DUINO
115 # STM32F103 does NOT have an USB bootloader in ROM (only serial), so setting anything here does not make much sense
116 STM32_BOOTLOADER_ADDRESS = 0x80000000
117
118 DFU_ARGS = -d 1EAF:0003 -a2 -R
119 DFU_SUFFIX_ARGS = -v 1EAF -p 0003
120endif
diff --git a/keyboards/cannonkeys/ortho48/bootloader_defs.h b/keyboards/cannonkeys/ortho48/bootloader_defs.h
deleted file mode 100644
index 6b8fa9f72..000000000
--- a/keyboards/cannonkeys/ortho48/bootloader_defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175):
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
4 * This also requires a patch to chibios:
5 * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
6 */
7
8// STM32F103* does NOT have an USB bootloader in ROM (only serial),
9// so setting anything here does not make much sense
10#define STM32_BOOTLOADER_ADDRESS 0x80000000
diff --git a/keyboards/cannonkeys/ortho48/rules.mk b/keyboards/cannonkeys/ortho48/rules.mk
index 5e18d91ca..6e468c49a 100644
--- a/keyboards/cannonkeys/ortho48/rules.mk
+++ b/keyboards/cannonkeys/ortho48/rules.mk
@@ -1,12 +1,8 @@
1# MCU name 1# MCU name
2MCU = STM32F103 2MCU = STM32F103
3 3
4# GENERIC STM32F103C8T6 board - stm32duino bootloader 4# Bootloader selection
5MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader 5BOOTLOADER = stm32duino
6BOARD = STM32_F103_STM32DUINO
7
8DFU_ARGS = -d 1eaf:0003 -a2 -R
9DFU_SUFFIX_ARGS = -v 1eaf -p 0003
10 6
11# project specific files 7# project specific files
12VPATH += keyboards/cannonkeys/bluepill 8VPATH += keyboards/cannonkeys/bluepill
diff --git a/keyboards/cannonkeys/ortho60/bootloader_defs.h b/keyboards/cannonkeys/ortho60/bootloader_defs.h
deleted file mode 100644
index 6b8fa9f72..000000000
--- a/keyboards/cannonkeys/ortho60/bootloader_defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175):
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
4 * This also requires a patch to chibios:
5 * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
6 */
7
8// STM32F103* does NOT have an USB bootloader in ROM (only serial),
9// so setting anything here does not make much sense
10#define STM32_BOOTLOADER_ADDRESS 0x80000000
diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk
index 80b31a12f..ea9bd6b2d 100644
--- a/keyboards/cannonkeys/ortho60/rules.mk
+++ b/keyboards/cannonkeys/ortho60/rules.mk
@@ -1,12 +1,8 @@
1# MCU name 1# MCU name
2MCU = STM32F103 2MCU = STM32F103
3 3
4# GENERIC STM32F103C8T6 board - stm32duino bootloader 4# Bootloader selection
5MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader 5BOOTLOADER = stm32duino
6BOARD = STM32_F103_STM32DUINO
7
8DFU_ARGS = -d 1eaf:0003 -a2 -R
9DFU_SUFFIX_ARGS = -v 1eaf -p 0003
10 6
11# project specific files 7# project specific files
12VPATH += keyboards/cannonkeys/bluepill 8VPATH += keyboards/cannonkeys/bluepill
diff --git a/keyboards/cannonkeys/ortho75/bootloader_defs.h b/keyboards/cannonkeys/ortho75/bootloader_defs.h
deleted file mode 100644
index 6b8fa9f72..000000000
--- a/keyboards/cannonkeys/ortho75/bootloader_defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175):
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
4 * This also requires a patch to chibios:
5 * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
6 */
7
8// STM32F103* does NOT have an USB bootloader in ROM (only serial),
9// so setting anything here does not make much sense
10#define STM32_BOOTLOADER_ADDRESS 0x80000000
diff --git a/keyboards/cannonkeys/ortho75/rules.mk b/keyboards/cannonkeys/ortho75/rules.mk
index ae196fd85..e132ccaf1 100644
--- a/keyboards/cannonkeys/ortho75/rules.mk
+++ b/keyboards/cannonkeys/ortho75/rules.mk
@@ -1,12 +1,8 @@
1# MCU name 1# MCU name
2MCU = STM32F103 2MCU = STM32F103
3 3
4# GENERIC STM32F103C8T6 board - stm32duino bootloader 4# Bootloader selection
5MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader 5BOOTLOADER = stm32duino
6BOARD = STM32_F103_STM32DUINO
7
8DFU_ARGS = -d 1eaf:0003 -a2 -R
9DFU_SUFFIX_ARGS = -v 1eaf -p 0003
10 6
11# project specific files 7# project specific files
12VPATH += keyboards/cannonkeys/bluepill 8VPATH += keyboards/cannonkeys/bluepill
diff --git a/keyboards/cannonkeys/practice60/bootloader_defs.h b/keyboards/cannonkeys/practice60/bootloader_defs.h
deleted file mode 100644
index 6b8fa9f72..000000000
--- a/keyboards/cannonkeys/practice60/bootloader_defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175):
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
4 * This also requires a patch to chibios:
5 * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
6 */
7
8// STM32F103* does NOT have an USB bootloader in ROM (only serial),
9// so setting anything here does not make much sense
10#define STM32_BOOTLOADER_ADDRESS 0x80000000
diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk
index 3713b6078..3f9ca1448 100644
--- a/keyboards/cannonkeys/practice60/rules.mk
+++ b/keyboards/cannonkeys/practice60/rules.mk
@@ -1,12 +1,8 @@
1# MCU name 1# MCU name
2MCU = STM32F103 2MCU = STM32F103
3 3
4# GENERIC STM32F103C8T6 board - stm32duino bootloader 4# Bootloader selection
5MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader 5BOOTLOADER = stm32duino
6BOARD = STM32_F103_STM32DUINO
7
8DFU_ARGS = -d 1eaf:0003 -a2 -R
9DFU_SUFFIX_ARGS = -v 1eaf -p 0003
10 6
11# project specific files 7# project specific files
12VPATH += keyboards/cannonkeys/bluepill 8VPATH += keyboards/cannonkeys/bluepill
diff --git a/keyboards/cannonkeys/practice65/bootloader_defs.h b/keyboards/cannonkeys/practice65/bootloader_defs.h
deleted file mode 100644
index 6b8fa9f72..000000000
--- a/keyboards/cannonkeys/practice65/bootloader_defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175):
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
4 * This also requires a patch to chibios:
5 * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
6 */
7
8// STM32F103* does NOT have an USB bootloader in ROM (only serial),
9// so setting anything here does not make much sense
10#define STM32_BOOTLOADER_ADDRESS 0x80000000
diff --git a/keyboards/cannonkeys/practice65/rules.mk b/keyboards/cannonkeys/practice65/rules.mk
index 5fd4892dc..344844b0e 100644
--- a/keyboards/cannonkeys/practice65/rules.mk
+++ b/keyboards/cannonkeys/practice65/rules.mk
@@ -1,12 +1,8 @@
1# MCU name 1# MCU name
2MCU = STM32F103 2MCU = STM32F103
3 3
4# GENERIC STM32F103C8T6 board - stm32duino bootloader 4# Bootloader selection
5MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader 5BOOTLOADER = stm32duino
6BOARD = STM32_F103_STM32DUINO
7
8DFU_ARGS = -d 1eaf:0003 -a2 -R
9DFU_SUFFIX_ARGS = -v 1eaf -p 0003
10 6
11# project specific files 7# project specific files
12VPATH += keyboards/cannonkeys/bluepill 8VPATH += keyboards/cannonkeys/bluepill
diff --git a/keyboards/converter/siemens_tastatur/bootloader_defs.h b/keyboards/converter/siemens_tastatur/bootloader_defs.h
deleted file mode 100644
index 6b8fa9f72..000000000
--- a/keyboards/converter/siemens_tastatur/bootloader_defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175):
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
4 * This also requires a patch to chibios:
5 * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
6 */
7
8// STM32F103* does NOT have an USB bootloader in ROM (only serial),
9// so setting anything here does not make much sense
10#define STM32_BOOTLOADER_ADDRESS 0x80000000
diff --git a/keyboards/converter/siemens_tastatur/rules.mk b/keyboards/converter/siemens_tastatur/rules.mk
index 03e6b0f49..451d07e67 100644
--- a/keyboards/converter/siemens_tastatur/rules.mk
+++ b/keyboards/converter/siemens_tastatur/rules.mk
@@ -1,12 +1,8 @@
1# MCU name 1# MCU name
2MCU = STM32F103 2MCU = STM32F103
3 3
4# GENERIC STM32F103C8T6 board - stm32duino bootloader 4# Bootloader selection
5MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader 5BOOTLOADER = stm32duino
6BOARD = STM32_F103_STM32DUINO
7
8DFU_ARGS = -d 1eaf:0003 -a2 -R
9DFU_SUFFIX_ARGS = -v 1eaf -p 0003
10 6
11SRC = matrix.c 7SRC = matrix.c
12 8
diff --git a/keyboards/handwired/onekey/bluepill/bootloader_defs.h b/keyboards/handwired/onekey/bluepill/bootloader_defs.h
deleted file mode 100644
index 6b8fa9f72..000000000
--- a/keyboards/handwired/onekey/bluepill/bootloader_defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175):
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
4 * This also requires a patch to chibios:
5 * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
6 */
7
8// STM32F103* does NOT have an USB bootloader in ROM (only serial),
9// so setting anything here does not make much sense
10#define STM32_BOOTLOADER_ADDRESS 0x80000000
diff --git a/keyboards/handwired/onekey/bluepill/rules.mk b/keyboards/handwired/onekey/bluepill/rules.mk
index 66ce51744..019b1130d 100644
--- a/keyboards/handwired/onekey/bluepill/rules.mk
+++ b/keyboards/handwired/onekey/bluepill/rules.mk
@@ -1,13 +1,8 @@
1# MCU name 1# MCU name
2MCU = STM32F103 2MCU = STM32F103
3 3
4# GENERIC STM32F103C8T6 board - stm32duino bootloader 4# Bootloader selection
5MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader 5BOOTLOADER = stm32duino
6BOARD = STM32_F103_STM32DUINO
7
8DFU_ARGS = -d 1eaf:0003 -a2 -R
9DFU_SUFFIX_ARGS = -v 1eaf -p 0003
10
11 6
12# Enter lower-power sleep mode when on the ChibiOS idle thread 7# Enter lower-power sleep mode when on the ChibiOS idle thread
13OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 8OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/t111/rules.mk b/keyboards/handwired/t111/rules.mk
index e6776a643..1c391242b 100644
--- a/keyboards/handwired/t111/rules.mk
+++ b/keyboards/handwired/t111/rules.mk
@@ -1,12 +1,7 @@
1MCU = STM32F103 1MCU = STM32F103
2 2
3# GENERIC STM32F103C8T6 board - stm32duino bootloader 3# Bootloader selection
4MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader 4BOOTLOADER = stm32duino
5BOARD = STM32_F103_STM32DUINO
6STM32_BOOTLOADER_ADDRESS = 0x80000000
7
8DFU_ARGS = -d 1EAF:0003 -a2 -R
9DFU_SUFFIX_ARGS = -v 1EAF -p 0003
10 5
11# Enter lower-power sleep mode when on the ChibiOS idle thread 6# Enter lower-power sleep mode when on the ChibiOS idle thread
12OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 7OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/z150/rules.mk b/keyboards/handwired/z150/rules.mk
index fd1d38203..d86e9f6e4 100644
--- a/keyboards/handwired/z150/rules.mk
+++ b/keyboards/handwired/z150/rules.mk
@@ -1,12 +1,7 @@
1MCU = STM32F103 1MCU = STM32F103
2 2
3# GENERIC STM32F103C8T6 board - stm32duino bootloader 3# Bootloader selection
4MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader 4BOOTLOADER = stm32duino
5BOARD = STM32_F103_STM32DUINO
6STM32_BOOTLOADER_ADDRESS = 0x80000000
7
8DFU_ARGS = -d 1eaf:0003 -a2 -R
9DFU_SUFFIX_ARGS = -v 1eaf -p 0003
10 5
11# Enter lower-power sleep mode when on the ChibiOS idle thread 6# Enter lower-power sleep mode when on the ChibiOS idle thread
12OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE 7OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/wolfmarkclub/wm1/bootloader_defs.h b/keyboards/wolfmarkclub/wm1/bootloader_defs.h
deleted file mode 100644
index 393d70fdc..000000000
--- a/keyboards/wolfmarkclub/wm1/bootloader_defs.h
+++ /dev/null
@@ -1,11 +0,0 @@
1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175):
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
4 * This also requires a patch to chibios:
5 * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
6 */
7
8// STM32F103 does not have a USB bootloader in ROM -- the WM1
9// has a usermode USB mass storage device bootloader at the normal
10// boot address -- `0x08000000`.
11#define STM32_BOOTLOADER_ADDRESS 0x80000000
diff --git a/keyboards/wolfmarkclub/wm1/rules.mk b/keyboards/wolfmarkclub/wm1/rules.mk
index fcd4da1af..9394bbd71 100644
--- a/keyboards/wolfmarkclub/wm1/rules.mk
+++ b/keyboards/wolfmarkclub/wm1/rules.mk
@@ -1,11 +1,13 @@
1# MCU name 1# MCU name
2MCU = STM32F103 2MCU = STM32F103
3 3
4# Bootloader selection
5BOOTLOADER = stm32duino
6
4# GENERIC STM32F103C8T6 board - mass storage bootloader 7# GENERIC STM32F103C8T6 board - mass storage bootloader
5MCU_LDSCRIPT = wm1_f103 8MCU_LDSCRIPT = wm1_f103
6BOARD = STM32_F103_STM32DUINO
7 9
8PROGRAM_CMD=echo 'CLI flashing not supported' >&2 10PROGRAM_CMD = echo 'CLI flashing not supported' >&2
9 11
10# Build Options 12# Build Options
11# change yes to no to disable 13# change yes to no to disable
diff --git a/keyboards/zvecr/split_blackpill/rules.mk b/keyboards/zvecr/split_blackpill/rules.mk
index 6feec7dd9..55bca894e 100644
--- a/keyboards/zvecr/split_blackpill/rules.mk
+++ b/keyboards/zvecr/split_blackpill/rules.mk
@@ -1,13 +1,8 @@
1# MCU name 1# MCU name
2MCU = STM32F103 2MCU = STM32F103
3 3
4# GENERIC STM32F103C8T6 board - stm32duino bootloader 4# Bootloader selection
5MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader 5BOOTLOADER = stm32duino
6BOARD = STM32_F103_STM32DUINO
7STM32_BOOTLOADER_ADDRESS = 0x80000000
8
9DFU_ARGS = -d 1eaf:0003 -a2 -R
10DFU_SUFFIX_ARGS = -v 1eaf -p 0003
11 6
12# Build Options 7# Build Options
13# change yes to no to disable 8# change yes to no to disable
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-21 19:21:03 +0000