1
0
tmk_keyboard/tmk_core/tool/chibios/ch-bootloader-jump.patch

117 lines
3.8 KiB
Diff
Raw Normal View History

2015-09-08 15:07:34 +00:00
diff --git a/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s b/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
index 51a79bb..42d07bd 100644
2015-09-08 15:07:34 +00:00
--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
+++ b/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
@@ -105,6 +105,13 @@
2015-09-08 15:07:34 +00:00
#define CRT0_CALL_DESTRUCTORS TRUE
#endif
+/**
+ * @brief Magic number for jumping to bootloader.
+ */
+#if !defined(MAGIC_BOOTLOADER_NUMBER) || defined(__DOXYGEN__)
+#define MAGIC_BOOTLOADER_NUMBER 0xDEADBEEF
+#endif
+
/*===========================================================================*/
/* Code section. */
/*===========================================================================*/
@@ -124,6 +131,17 @@
2015-09-08 15:07:34 +00:00
.thumb_func
.global Reset_Handler
Reset_Handler:
+
+#ifdef STM32_BOOTLOADER_ADDRESS
2015-09-08 15:07:34 +00:00
+ /* jump to bootloader code */
+ ldr r0, =__ram0_end__-4
+ ldr r1, =MAGIC_BOOTLOADER_NUMBER
+ ldr r2, [r0, #0]
+ str r0, [r0, #0] /* erase stored magic */
+ cmp r2, r1
+ beq Bootloader_Jump
+#endif /* STM32_BOOTLOADER_ADDRESS */
2015-09-08 15:07:34 +00:00
+
/* Interrupts are globally masked initially.*/
cpsid i
@@ -242,6 +260,21 @@ endfiniloop:
2015-09-08 15:07:34 +00:00
ldr r1, =__default_exit
bx r1
+#ifdef STM32_BOOTLOADER_ADDRESS
2015-09-08 15:07:34 +00:00
+/*
+ * Jump-to-bootloader function.
+ */
+
+ .align 2
+ .thumb_func
+Bootloader_Jump:
+ ldr r0, =STM32_BOOTLOADER_ADDRESS
2015-09-08 15:07:34 +00:00
+ ldr r1, [r0, #0]
+ mov sp, r1
+ ldr r0, [r0, #4]
+ bx r0
+#endif /* STM32_BOOTLOADER_ADDRESS */
2015-09-08 15:07:34 +00:00
+
#endif
/** @} */
diff --git a/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s b/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
index 4812a29..dca9f88 100644
2015-09-08 15:07:34 +00:00
--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
+++ b/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
@@ -140,6 +140,13 @@
2015-09-08 15:07:34 +00:00
#define CRT0_CPACR_INIT 0x00F00000
#endif
+/**
+ * @brief Magic number for jumping to bootloader.
+ */
+#if !defined(MAGIC_BOOTLOADER_NUMBER) || defined(__DOXYGEN__)
+#define MAGIC_BOOTLOADER_NUMBER 0xDEADBEEF
+#endif
+
/*===========================================================================*/
/* Code section. */
/*===========================================================================*/
@@ -164,6 +171,17 @@
2015-09-08 15:07:34 +00:00
.thumb_func
.global Reset_Handler
Reset_Handler:
+
+#ifdef STM32_BOOTLOADER_ADDRESS
2015-09-08 15:07:34 +00:00
+ /* jump to bootloader code */
+ ldr r0, =__ram0_end__-4
+ ldr r1, =MAGIC_BOOTLOADER_NUMBER
+ ldr r2, [r0, #0]
+ str r0, [r0, #0] /* erase stored magic */
+ cmp r2, r1
+ beq Bootloader_Jump
+#endif /* STM32_BOOTLOADER_ADDRESS */
2015-09-08 15:07:34 +00:00
+
/* Interrupts are globally masked initially.*/
cpsid i
@@ -305,6 +323,21 @@ endfiniloop:
2015-09-08 15:07:34 +00:00
/* Branching to the defined exit handler.*/
b __default_exit
+#ifdef STM32_BOOTLOADER_ADDRESS
2015-09-08 15:07:34 +00:00
+/*
+ * Jump-to-bootloader function.
+ */
+
+ .align 2
+ .thumb_func
+Bootloader_Jump:
+ ldr r0, =STM32_BOOTLOADER_ADDRESS
2015-09-08 15:07:34 +00:00
+ ldr r1, [r0, #0]
+ mov sp, r1
+ ldr r0, [r0, #4]
+ bx r0
+#endif /* STM32_BOOTLOADER_ADDRESS */
2015-09-08 15:07:34 +00:00
+
#endif /* !defined(__DOXYGEN__) */
/** @} */