aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--keyboards/at_at/660m/bootloader_defs.h2
-rw-r--r--keyboards/cannonkeys/satisfaction75/bootloader_defs.h2
-rw-r--r--keyboards/chavdai40/bootloader_defs.h2
-rw-r--r--keyboards/clueboard/66_hotswap/gen1/config.h2
-rw-r--r--keyboards/handwired/bluepill/bluepill70/bootloader_defs.h2
-rw-r--r--keyboards/matrix/m20add/bootloader_defs.h2
-rw-r--r--keyboards/matrix/noah/bootloader_defs.h2
-rw-r--r--keyboards/nebula12/bootloader_defs.h2
-rw-r--r--platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h2
-rw-r--r--platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h2
-rw-r--r--platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h2
-rw-r--r--tmk_core/tool/chibios/.gitignore2
-rw-r--r--tmk_core/tool/chibios/ch-bootloader-jump.patch116
13 files changed, 0 insertions, 140 deletions
diff --git a/keyboards/at_at/660m/bootloader_defs.h b/keyboards/at_at/660m/bootloader_defs.h
index 02c48c4e6..dccd0fa5d 100644
--- a/keyboards/at_at/660m/bootloader_defs.h
+++ b/keyboards/at_at/660m/bootloader_defs.h
@@ -1,7 +1,5 @@
1/* Address for jumping to bootloader on STM32 chips. */ 1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175): 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 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 */ 4 */
7#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800 5#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800
diff --git a/keyboards/cannonkeys/satisfaction75/bootloader_defs.h b/keyboards/cannonkeys/satisfaction75/bootloader_defs.h
index 02c48c4e6..dccd0fa5d 100644
--- a/keyboards/cannonkeys/satisfaction75/bootloader_defs.h
+++ b/keyboards/cannonkeys/satisfaction75/bootloader_defs.h
@@ -1,7 +1,5 @@
1/* Address for jumping to bootloader on STM32 chips. */ 1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175): 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 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 */ 4 */
7#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800 5#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800
diff --git a/keyboards/chavdai40/bootloader_defs.h b/keyboards/chavdai40/bootloader_defs.h
index 4994be9c2..6b218f7bd 100644
--- a/keyboards/chavdai40/bootloader_defs.h
+++ b/keyboards/chavdai40/bootloader_defs.h
@@ -1,7 +1,5 @@
1/* Address for jumping to bootloader on STM32 chips. */ 1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here: 2/* It is chip dependent, the correct number can be looked up here:
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf 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 */ 4 */
7#define STM32_BOOTLOADER_ADDRESS 0x1FFFC400 \ No newline at end of file 5#define STM32_BOOTLOADER_ADDRESS 0x1FFFC400 \ No newline at end of file
diff --git a/keyboards/clueboard/66_hotswap/gen1/config.h b/keyboards/clueboard/66_hotswap/gen1/config.h
index ea01a078b..7c90d05b3 100644
--- a/keyboards/clueboard/66_hotswap/gen1/config.h
+++ b/keyboards/clueboard/66_hotswap/gen1/config.h
@@ -27,8 +27,6 @@
27/* Address for jumping to bootloader on STM32 chips. */ 27/* Address for jumping to bootloader on STM32 chips. */
28/* It is chip dependent, the correct number can be looked up here: 28/* It is chip dependent, the correct number can be looked up here:
29 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf 29 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
30 * This also requires a patch to chibios:
31 * <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
32 */ 30 */
33#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800 31#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
34 32
diff --git a/keyboards/handwired/bluepill/bluepill70/bootloader_defs.h b/keyboards/handwired/bluepill/bluepill70/bootloader_defs.h
index 0f45203cb..46c37a25e 100644
--- a/keyboards/handwired/bluepill/bluepill70/bootloader_defs.h
+++ b/keyboards/handwired/bluepill/bluepill70/bootloader_defs.h
@@ -1,8 +1,6 @@
1/* Address for jumping to bootloader on STM32 chips. */ 1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175): 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 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 */ 4 */
7 5
8// STM32F103* does NOT have an USB bootloader in ROM (only serial), 6// STM32F103* does NOT have an USB bootloader in ROM (only serial),
diff --git a/keyboards/matrix/m20add/bootloader_defs.h b/keyboards/matrix/m20add/bootloader_defs.h
index 20b8f73e6..4da3d39a3 100644
--- a/keyboards/matrix/m20add/bootloader_defs.h
+++ b/keyboards/matrix/m20add/bootloader_defs.h
@@ -1,7 +1,5 @@
1/* Address for jumping to bootloader on STM32 chips. */ 1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here: 2/* It is chip dependent, the correct number can be looked up here:
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf 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 */ 4 */
7#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000 5#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
diff --git a/keyboards/matrix/noah/bootloader_defs.h b/keyboards/matrix/noah/bootloader_defs.h
index 20b8f73e6..4da3d39a3 100644
--- a/keyboards/matrix/noah/bootloader_defs.h
+++ b/keyboards/matrix/noah/bootloader_defs.h
@@ -1,7 +1,5 @@
1/* Address for jumping to bootloader on STM32 chips. */ 1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here: 2/* It is chip dependent, the correct number can be looked up here:
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf 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 */ 4 */
7#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000 5#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
diff --git a/keyboards/nebula12/bootloader_defs.h b/keyboards/nebula12/bootloader_defs.h
index 02c48c4e6..dccd0fa5d 100644
--- a/keyboards/nebula12/bootloader_defs.h
+++ b/keyboards/nebula12/bootloader_defs.h
@@ -1,7 +1,5 @@
1/* Address for jumping to bootloader on STM32 chips. */ 1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175): 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 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 */ 4 */
7#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800 5#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800
diff --git a/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h b/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h
index 4994be9c2..6b218f7bd 100644
--- a/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h
+++ b/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h
@@ -1,7 +1,5 @@
1/* Address for jumping to bootloader on STM32 chips. */ 1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here: 2/* It is chip dependent, the correct number can be looked up here:
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf 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 */ 4 */
7#define STM32_BOOTLOADER_ADDRESS 0x1FFFC400 \ No newline at end of file 5#define STM32_BOOTLOADER_ADDRESS 0x1FFFC400 \ No newline at end of file
diff --git a/platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h b/platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h
index 02c48c4e6..dccd0fa5d 100644
--- a/platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h
+++ b/platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h
@@ -1,7 +1,5 @@
1/* Address for jumping to bootloader on STM32 chips. */ 1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here (page 175): 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 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 */ 4 */
7#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800 5#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800
diff --git a/platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h b/platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h
index 3b0e9d20a..87ac7b10d 100644
--- a/platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h
+++ b/platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h
@@ -1,7 +1,5 @@
1/* Address for jumping to bootloader on STM32 chips. */ 1/* Address for jumping to bootloader on STM32 chips. */
2/* It is chip dependent, the correct number can be looked up here: 2/* It is chip dependent, the correct number can be looked up here:
3 * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf 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 */ 4 */
7#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800 5#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
diff --git a/tmk_core/tool/chibios/.gitignore b/tmk_core/tool/chibios/.gitignore
deleted file mode 100644
index 88bbafe34..000000000
--- a/tmk_core/tool/chibios/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
1chibios
2chibios-contrib
diff --git a/tmk_core/tool/chibios/ch-bootloader-jump.patch b/tmk_core/tool/chibios/ch-bootloader-jump.patch
deleted file mode 100644
index c6eb2405c..000000000
--- a/tmk_core/tool/chibios/ch-bootloader-jump.patch
+++ /dev/null
@@ -1,116 +0,0 @@
1diff --git a/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s b/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
2index 51a79bb..42d07bd 100644
3--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
4+++ b/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
5@@ -105,6 +105,13 @@
6 #define CRT0_CALL_DESTRUCTORS TRUE
7 #endif
8
9+/**
10+ * @brief Magic number for jumping to bootloader.
11+ */
12+#if !defined(MAGIC_BOOTLOADER_NUMBER) || defined(__DOXYGEN__)
13+#define MAGIC_BOOTLOADER_NUMBER 0xDEADBEEF
14+#endif
15+
16 /*===========================================================================*/
17 /* Code section. */
18 /*===========================================================================*/
19@@ -124,6 +131,17 @@
20 .thumb_func
21 .global Reset_Handler
22 Reset_Handler:
23+
24+#ifdef STM32_BOOTLOADER_ADDRESS
25+ /* jump to bootloader code */
26+ ldr r0, =__ram0_end__-4
27+ ldr r1, =MAGIC_BOOTLOADER_NUMBER
28+ ldr r2, [r0, #0]
29+ str r0, [r0, #0] /* erase stored magic */
30+ cmp r2, r1
31+ beq Bootloader_Jump
32+#endif /* STM32_BOOTLOADER_ADDRESS */
33+
34 /* Interrupts are globally masked initially.*/
35 cpsid i
36
37@@ -242,6 +260,21 @@ endfiniloop:
38 ldr r1, =__default_exit
39 bx r1
40
41+#ifdef STM32_BOOTLOADER_ADDRESS
42+/*
43+ * Jump-to-bootloader function.
44+ */
45+
46+ .align 2
47+ .thumb_func
48+Bootloader_Jump:
49+ ldr r0, =STM32_BOOTLOADER_ADDRESS
50+ ldr r1, [r0, #0]
51+ mov sp, r1
52+ ldr r0, [r0, #4]
53+ bx r0
54+#endif /* STM32_BOOTLOADER_ADDRESS */
55+
56 #endif
57
58 /** @} */
59diff --git a/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s b/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
60index 4812a29..dca9f88 100644
61--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
62+++ b/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
63@@ -140,6 +140,13 @@
64 #define CRT0_CPACR_INIT 0x00F00000
65 #endif
66
67+/**
68+ * @brief Magic number for jumping to bootloader.
69+ */
70+#if !defined(MAGIC_BOOTLOADER_NUMBER) || defined(__DOXYGEN__)
71+#define MAGIC_BOOTLOADER_NUMBER 0xDEADBEEF
72+#endif
73+
74 /*===========================================================================*/
75 /* Code section. */
76 /*===========================================================================*/
77@@ -164,6 +171,17 @@
78 .thumb_func
79 .global Reset_Handler
80 Reset_Handler:
81+
82+#ifdef STM32_BOOTLOADER_ADDRESS
83+ /* jump to bootloader code */
84+ ldr r0, =__ram0_end__-4
85+ ldr r1, =MAGIC_BOOTLOADER_NUMBER
86+ ldr r2, [r0, #0]
87+ str r0, [r0, #0] /* erase stored magic */
88+ cmp r2, r1
89+ beq Bootloader_Jump
90+#endif /* STM32_BOOTLOADER_ADDRESS */
91+
92 /* Interrupts are globally masked initially.*/
93 cpsid i
94
95@@ -305,6 +323,21 @@ endfiniloop:
96 /* Branching to the defined exit handler.*/
97 b __default_exit
98
99+#ifdef STM32_BOOTLOADER_ADDRESS
100+/*
101+ * Jump-to-bootloader function.
102+ */
103+
104+ .align 2
105+ .thumb_func
106+Bootloader_Jump:
107+ ldr r0, =STM32_BOOTLOADER_ADDRESS
108+ ldr r1, [r0, #0]
109+ mov sp, r1
110+ ldr r0, [r0, #4]
111+ bx r0
112+#endif /* STM32_BOOTLOADER_ADDRESS */
113+
114 #endif /* !defined(__DOXYGEN__) */
115
116 /** @} */
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-23 06:38:53 +0000