X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Ftool%2Fchibios%2Fch-bootloader-jump.patch;h=d8865762143d2e8a1f369e6ed0e367025e946667;hb=83a3de38b710d0eb5a752ffded6da2e8bf818b22;hp=7f33e8ac3fd82b283680392858d83700a99ee3f2;hpb=d057e5157ed22508ce87f8fef113be52674ba209;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/tool/chibios/ch-bootloader-jump.patch b/tmk_core/tool/chibios/ch-bootloader-jump.patch
index 7f33e8ac..d8865762 100644
--- a/tmk_core/tool/chibios/ch-bootloader-jump.patch
+++ b/tmk_core/tool/chibios/ch-bootloader-jump.patch
@@ -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__) */