max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move STM32 bootloader address config to separate .h file.

Browse source
This commit is contained in:
flabbergast 2015-10-05 10:23:31 +01:00
parent 438559f11d
commit 88c053f78e
6 changed files with 51 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tmk_core/tool/chibios/ch-bootloader-jump.patch
View file

@ -1,8 +1,8 @@
diff --git a/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s b/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
index 38b4513..12a3f39 100644
index 51a79bb..42d07bd 100644
--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
+++ b/os/common/ports/ARMCMx/compilers/GCC/crt0_v6m.s
@@ -98,6 +98,13 @@
@@ -105,6 +105,13 @@
#define CRT0_CALL_DESTRUCTORS TRUE
#endif
@ -16,12 +16,12 @@ index 38b4513..12a3f39 100644
/*===========================================================================*/
/* Code section. */
/*===========================================================================*/
@@ -117,6 +124,17 @@
@@ -124,6 +131,17 @@
.thumb_func
.global Reset_Handler
Reset_Handler:
+
+#ifdef BOOTLOADER_ADDRESS
+#ifdef STM32_BOOTLOADER_ADDRESS
+ /* jump to bootloader code */
+ ldr r0, =__ram0_end__-4
+ ldr r1, =MAGIC_BOOTLOADER_NUMBER
@ -29,16 +29,16 @@ index 38b4513..12a3f39 100644
+ str r0, [r0, #0] /* erase stored magic */
+ cmp r2, r1
+ beq Bootloader_Jump
+#endif /* BOOTLOADER_ADDRESS */
+#endif /* STM32_BOOTLOADER_ADDRESS */
+
/* Interrupts are globally masked initially.*/
cpsid i
@@ -230,6 +248,21 @@ endfiniloop:
@@ -242,6 +260,21 @@ endfiniloop:
ldr r1, =__default_exit
bx r1
+#ifdef BOOTLOADER_ADDRESS
+#ifdef STM32_BOOTLOADER_ADDRESS
+/*
+ * Jump-to-bootloader function.
+ */
@ -46,21 +46,21 @@ index 38b4513..12a3f39 100644
+ .align 2
+ .thumb_func
+Bootloader_Jump:
+ ldr r0, =BOOTLOADER_ADDRESS
+ ldr r0, =STM32_BOOTLOADER_ADDRESS
+ ldr r1, [r0, #0]
+ mov sp, r1
+ ldr r0, [r0, #4]
+ bx r0
+#endif /* BOOTLOADER_ADDRESS */
+#endif /* STM32_BOOTLOADER_ADDRESS */
+
#endif
/** @} */
diff --git a/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s b/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
index fcfa4de..2d560da 100644
index 4812a29..dca9f88 100644
--- a/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
+++ b/os/common/ports/ARMCMx/compilers/GCC/crt0_v7m.s
@@ -133,6 +133,13 @@
@@ -140,6 +140,13 @@
#define CRT0_CPACR_INIT 0x00F00000
#endif
@ -74,11 +74,12 @@ index fcfa4de..2d560da 100644
/*===========================================================================*/
/* Code section. */
/*===========================================================================*/
@@ -157,6 +164,16 @@
@@ -164,6 +171,17 @@
.thumb_func
.global Reset_Handler
Reset_Handler:
+#ifdef BOOTLOADER_ADDRESS
+
+#ifdef STM32_BOOTLOADER_ADDRESS
+ /* jump to bootloader code */
+ ldr r0, =__ram0_end__-4
+ ldr r1, =MAGIC_BOOTLOADER_NUMBER
@ -86,16 +87,16 @@ index fcfa4de..2d560da 100644
+ str r0, [r0, #0] /* erase stored magic */
+ cmp r2, r1
+ beq Bootloader_Jump
+#endif /* BOOTLOADER_ADDRESS */
+#endif /* STM32_BOOTLOADER_ADDRESS */
+
/* Interrupts are globally masked initially.*/
cpsid i
@@ -289,6 +306,21 @@ endfiniloop:
@@ -305,6 +323,21 @@ endfiniloop:
/* Branching to the defined exit handler.*/
b __default_exit
+#ifdef BOOTLOADER_ADDRESS
+#ifdef STM32_BOOTLOADER_ADDRESS
+/*
+ * Jump-to-bootloader function.
+ */
@ -103,12 +104,12 @@ index fcfa4de..2d560da 100644
+ .align 2
+ .thumb_func
+Bootloader_Jump:
+ ldr r0, =BOOTLOADER_ADDRESS
+ ldr r0, =STM32_BOOTLOADER_ADDRESS
+ ldr r1, [r0, #0]
+ mov sp, r1
+ ldr r0, [r0, #4]
+ bx r0
+#endif /* BOOTLOADER_ADDRESS */
+#endif /* STM32_BOOTLOADER_ADDRESS */
+
#endif /* !defined(__DOXYGEN__) */