aboutsummaryrefslogtreecommitdiff
path: root/tmk_core/tool
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-08-20 17:59:18 +0300
committerFred Sundvik <fsundvik@gmail.com>2016-08-20 17:59:18 +0300
commitfd2f957a1aeefa523c33c709365fd2f2928fd2d2 (patch)
tree9ba6db6e96d04764d162bb767ce225f920be182b /tmk_core/tool
parentf0fd840a578752bdd820c302f58e406849f2b55c (diff)
downloadqmk_firmware-fd2f957a1aeefa523c33c709365fd2f2928fd2d2.tar.gz
qmk_firmware-fd2f957a1aeefa523c33c709365fd2f2928fd2d2.zip
Normalize line endings
Diffstat (limited to 'tmk_core/tool')
-rw-r--r--tmk_core/tool/chibios/ch-bootloader-jump.patch204
1 files changed, 102 insertions, 102 deletions
diff --git a/tmk_core/tool/chibios/ch-bootloader-jump.patch b/tmk_core/tool/chibios/ch-bootloader-jump.patch
index d88657621..c6eb2405c 100644
--- a/tmk_core/tool/chibios/ch-bootloader-jump.patch
+++ b/tmk_core/tool/chibios/ch-bootloader-jump.patch
@@ -3,114 +3,114 @@ index 51a79bb..42d07bd 100644
3--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s 3--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
4+++ b/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 @@ 5@@ -105,6 +105,13 @@
6 #define CRT0_CALL_DESTRUCTORS TRUE 6 #define CRT0_CALL_DESTRUCTORS TRUE
7 #endif 7 #endif
8 8
9+/** 9+/**
10+ * @brief Magic number for jumping to bootloader. 10+ * @brief Magic number for jumping to bootloader.
11+ */ 11+ */
12+#if !defined(MAGIC_BOOTLOADER_NUMBER) || defined(__DOXYGEN__) 12+#if !defined(MAGIC_BOOTLOADER_NUMBER) || defined(__DOXYGEN__)
13+#define MAGIC_BOOTLOADER_NUMBER 0xDEADBEEF 13+#define MAGIC_BOOTLOADER_NUMBER 0xDEADBEEF
14+#endif 14+#endif
15+ 15+
16 /*===========================================================================*/ 16 /*===========================================================================*/
17 /* Code section. */ 17 /* Code section. */
18 /*===========================================================================*/ 18 /*===========================================================================*/
19@@ -124,6 +131,17 @@ 19@@ -124,6 +131,17 @@
20 .thumb_func 20 .thumb_func
21 .global Reset_Handler 21 .global Reset_Handler
22 Reset_Handler: 22 Reset_Handler:
23+ 23+
24+#ifdef STM32_BOOTLOADER_ADDRESS 24+#ifdef STM32_BOOTLOADER_ADDRESS
25+ /* jump to bootloader code */ 25+ /* jump to bootloader code */
26+ ldr r0, =__ram0_end__-4 26+ ldr r0, =__ram0_end__-4
27+ ldr r1, =MAGIC_BOOTLOADER_NUMBER 27+ ldr r1, =MAGIC_BOOTLOADER_NUMBER
28+ ldr r2, [r0, #0] 28+ ldr r2, [r0, #0]
29+ str r0, [r0, #0] /* erase stored magic */ 29+ str r0, [r0, #0] /* erase stored magic */
30+ cmp r2, r1 30+ cmp r2, r1
31+ beq Bootloader_Jump 31+ beq Bootloader_Jump
32+#endif /* STM32_BOOTLOADER_ADDRESS */ 32+#endif /* STM32_BOOTLOADER_ADDRESS */
33+ 33+
34 /* Interrupts are globally masked initially.*/ 34 /* Interrupts are globally masked initially.*/
35 cpsid i 35 cpsid i
36 36
37@@ -242,6 +260,21 @@ endfiniloop: 37@@ -242,6 +260,21 @@ endfiniloop:
38 ldr r1, =__default_exit 38 ldr r1, =__default_exit
39 bx r1 39 bx r1
40 40
41+#ifdef STM32_BOOTLOADER_ADDRESS 41+#ifdef STM32_BOOTLOADER_ADDRESS
42+/* 42+/*
43+ * Jump-to-bootloader function. 43+ * Jump-to-bootloader function.
44+ */ 44+ */
45+ 45+
46+ .align 2 46+ .align 2
47+ .thumb_func 47+ .thumb_func
48+Bootloader_Jump: 48+Bootloader_Jump:
49+ ldr r0, =STM32_BOOTLOADER_ADDRESS 49+ ldr r0, =STM32_BOOTLOADER_ADDRESS
50+ ldr r1, [r0, #0] 50+ ldr r1, [r0, #0]
51+ mov sp, r1 51+ mov sp, r1
52+ ldr r0, [r0, #4] 52+ ldr r0, [r0, #4]
53+ bx r0 53+ bx r0
54+#endif /* STM32_BOOTLOADER_ADDRESS */ 54+#endif /* STM32_BOOTLOADER_ADDRESS */
55+ 55+
56 #endif 56 #endif
57 57
58 /** @} */ 58 /** @} */
59diff --git a/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s b/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s 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 60index 4812a29..dca9f88 100644
61--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s 61--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
62+++ b/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 @@ 63@@ -140,6 +140,13 @@
64 #define CRT0_CPACR_INIT 0x00F00000 64 #define CRT0_CPACR_INIT 0x00F00000
65 #endif 65 #endif
66 66
67+/** 67+/**
68+ * @brief Magic number for jumping to bootloader. 68+ * @brief Magic number for jumping to bootloader.
69+ */ 69+ */
70+#if !defined(MAGIC_BOOTLOADER_NUMBER) || defined(__DOXYGEN__) 70+#if !defined(MAGIC_BOOTLOADER_NUMBER) || defined(__DOXYGEN__)
71+#define MAGIC_BOOTLOADER_NUMBER 0xDEADBEEF 71+#define MAGIC_BOOTLOADER_NUMBER 0xDEADBEEF
72+#endif 72+#endif
73+ 73+
74 /*===========================================================================*/ 74 /*===========================================================================*/
75 /* Code section. */ 75 /* Code section. */
76 /*===========================================================================*/ 76 /*===========================================================================*/
77@@ -164,6 +171,17 @@ 77@@ -164,6 +171,17 @@
78 .thumb_func 78 .thumb_func
79 .global Reset_Handler 79 .global Reset_Handler
80 Reset_Handler: 80 Reset_Handler:
81+ 81+
82+#ifdef STM32_BOOTLOADER_ADDRESS 82+#ifdef STM32_BOOTLOADER_ADDRESS
83+ /* jump to bootloader code */ 83+ /* jump to bootloader code */
84+ ldr r0, =__ram0_end__-4 84+ ldr r0, =__ram0_end__-4
85+ ldr r1, =MAGIC_BOOTLOADER_NUMBER 85+ ldr r1, =MAGIC_BOOTLOADER_NUMBER
86+ ldr r2, [r0, #0] 86+ ldr r2, [r0, #0]
87+ str r0, [r0, #0] /* erase stored magic */ 87+ str r0, [r0, #0] /* erase stored magic */
88+ cmp r2, r1 88+ cmp r2, r1
89+ beq Bootloader_Jump 89+ beq Bootloader_Jump
90+#endif /* STM32_BOOTLOADER_ADDRESS */ 90+#endif /* STM32_BOOTLOADER_ADDRESS */
91+ 91+
92 /* Interrupts are globally masked initially.*/ 92 /* Interrupts are globally masked initially.*/
93 cpsid i 93 cpsid i
94 94
95@@ -305,6 +323,21 @@ endfiniloop: 95@@ -305,6 +323,21 @@ endfiniloop:
96 /* Branching to the defined exit handler.*/ 96 /* Branching to the defined exit handler.*/
97 b __default_exit 97 b __default_exit
98 98
99+#ifdef STM32_BOOTLOADER_ADDRESS 99+#ifdef STM32_BOOTLOADER_ADDRESS
100+/* 100+/*
101+ * Jump-to-bootloader function. 101+ * Jump-to-bootloader function.
102+ */ 102+ */
103+ 103+
104+ .align 2 104+ .align 2
105+ .thumb_func 105+ .thumb_func
106+Bootloader_Jump: 106+Bootloader_Jump:
107+ ldr r0, =STM32_BOOTLOADER_ADDRESS 107+ ldr r0, =STM32_BOOTLOADER_ADDRESS
108+ ldr r1, [r0, #0] 108+ ldr r1, [r0, #0]
109+ mov sp, r1 109+ mov sp, r1
110+ ldr r0, [r0, #4] 110+ ldr r0, [r0, #4]
111+ bx r0 111+ bx r0
112+#endif /* STM32_BOOTLOADER_ADDRESS */ 112+#endif /* STM32_BOOTLOADER_ADDRESS */
113+ 113+
114 #endif /* !defined(__DOXYGEN__) */ 114 #endif /* !defined(__DOXYGEN__) */
115 115
116 /** @} */ 116 /** @} */
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-12 04:19:03 +0000