summaryrefslogtreecommitdiff
path: root/keyboards/handwired
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 /keyboards/handwired
parentadc06c5b3b537f551557dbbd62f43458f6771db0 (diff)
Add STM32Duino to bootloader selection (#10558)
Diffstat (limited to 'keyboards/handwired')
-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
4 files changed, 6 insertions, 31 deletions
diff --git a/keyboards/handwired/onekey/bluepill/bootloader_defs.h b/keyboards/handwired/onekey/bluepill/bootloader_defs.h
deleted file mode 100644
index 6b8fa9f727..0000000000
--- a/keyboards/handwired/onekey/bluepill/bootloader_defs.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here (page 175):
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
- */
-
-// STM32F103* does NOT have an USB bootloader in ROM (only serial),
-// so setting anything here does not make much sense
-#define STM32_BOOTLOADER_ADDRESS 0x80000000
diff --git a/keyboards/handwired/onekey/bluepill/rules.mk b/keyboards/handwired/onekey/bluepill/rules.mk
index 66ce517445..019b1130d9 100644
--- a/keyboards/handwired/onekey/bluepill/rules.mk
+++ b/keyboards/handwired/onekey/bluepill/rules.mk
@@ -1,13 +1,8 @@
# MCU name
MCU = STM32F103
-# GENERIC STM32F103C8T6 board - stm32duino bootloader
-MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
-BOARD = STM32_F103_STM32DUINO
-
-DFU_ARGS = -d 1eaf:0003 -a2 -R
-DFU_SUFFIX_ARGS = -v 1eaf -p 0003
-
+# Bootloader selection
+BOOTLOADER = stm32duino
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/t111/rules.mk b/keyboards/handwired/t111/rules.mk
index e6776a643c..1c391242ba 100644
--- a/keyboards/handwired/t111/rules.mk
+++ b/keyboards/handwired/t111/rules.mk
@@ -1,12 +1,7 @@
MCU = STM32F103
-# GENERIC STM32F103C8T6 board - stm32duino bootloader
-MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
-BOARD = STM32_F103_STM32DUINO
-STM32_BOOTLOADER_ADDRESS = 0x80000000
-
-DFU_ARGS = -d 1EAF:0003 -a2 -R
-DFU_SUFFIX_ARGS = -v 1EAF -p 0003
+# Bootloader selection
+BOOTLOADER = stm32duino
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/z150/rules.mk b/keyboards/handwired/z150/rules.mk
index fd1d382033..d86e9f6e46 100644
--- a/keyboards/handwired/z150/rules.mk
+++ b/keyboards/handwired/z150/rules.mk
@@ -1,12 +1,7 @@
MCU = STM32F103
-# GENERIC STM32F103C8T6 board - stm32duino bootloader
-MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
-BOARD = STM32_F103_STM32DUINO
-STM32_BOOTLOADER_ADDRESS = 0x80000000
-
-DFU_ARGS = -d 1eaf:0003 -a2 -R
-DFU_SUFFIX_ARGS = -v 1eaf -p 0003
+# Bootloader selection
+BOOTLOADER = stm32duino
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE