summaryrefslogtreecommitdiff
path: root/keyboards/ergodox_stm32
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2022-02-07 14:09:21 +1100
committerGitHub <noreply@github.com>2022-02-06 19:09:21 -0800
commita86d6fffc950242f412e05a6a0aed8beede01ba4 (patch)
treec99bd067b88e74458677df79a58bd80c01003aa3 /keyboards/ergodox_stm32
parent53a73066828bb528610e8d02bd4a6f008c9c33d7 (diff)
downloadqmk_firmware-a86d6fffc950242f412e05a6a0aed8beede01ba4.tar.gz
qmk_firmware-a86d6fffc950242f412e05a6a0aed8beede01ba4.zip
Fixup bootloaders. (#16256)
Diffstat (limited to 'keyboards/ergodox_stm32')
-rw-r--r--keyboards/ergodox_stm32/ergodox_stm32.c5
-rw-r--r--keyboards/ergodox_stm32/rules.mk3
2 files changed, 8 insertions, 0 deletions
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.c b/keyboards/ergodox_stm32/ergodox_stm32.c
index 846c29d7a4..8419b40f41 100644
--- a/keyboards/ergodox_stm32/ergodox_stm32.c
+++ b/keyboards/ergodox_stm32/ergodox_stm32.c
@@ -16,6 +16,11 @@ void board_init(void) {
AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE;
}
+void bootloader_jump(void) {
+ // This board doesn't use the "standard" stm32duino bootloader, and is resident in memory at the base location. All we can do here is reset.
+ NVIC_SystemReset();
+}
+
void matrix_init_kb(void)
{
// Init LED Ports
diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk
index 3f7197cbf6..e730df82aa 100644
--- a/keyboards/ergodox_stm32/rules.mk
+++ b/keyboards/ergodox_stm32/rules.mk
@@ -3,6 +3,9 @@ MCU = STM32F103
MCU_LDSCRIPT = stm32f103_bootloader
BOARD = ST_NUCLEO64_F103RB
+# Bootloader selection
+BOOTLOADER = custom
+
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control