Merge pull request #2381 from BrewBlox/fix/hardfault-handler

Fix hardfault handler to SOS again
particle-iot · Dec 7, 2021 · 5af90dd · 5af90dd
2 parents 381b538 + 513651a
commit 5af90dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/bootloader/src/nRF52840/nrf_it.c b/bootloader/src/nRF52840/nrf_it.c
@@ -83,8 +83,9 @@ void HardFault_Handler(void)
         " mrseq r0, msp                                             \n"
         " mrsne r0, psp                                             \n"
         " ldr r1, [r0, #24]                                         \n"
-        " ldr r2, =handler2_address_const                           \n"
+        " ldr r2, handler2_address_const                            \n"
         " bx r2                                                     \n"
+        " .align 4                                                  \n"
         " handler2_address_const: .word prvGetRegistersFromStack    \n"
     );
 }

diff --git a/hal/src/nRF52840/core_hal.c b/hal/src/nRF52840/core_hal.c
@@ -146,8 +146,9 @@ void HardFault_Handler(void) {
         " mrseq r0, msp                                             \n"
         " mrsne r0, psp                                             \n"
         " ldr r1, [r0, #24]                                         \n"
-        " ldr r2, =handler2_address_const                           \n"
+        " ldr r2, handler2_address_const                            \n"
         " bx r2                                                     \n"
+        " .align 4                                                  \n"
         " handler2_address_const: .word prvGetRegistersFromStack    \n"
     );
 }

diff --git a/hal/src/stm32f2xx/core_hal_stm32f2xx.c b/hal/src/stm32f2xx/core_hal_stm32f2xx.c
@@ -120,8 +120,9 @@ void HardFault_Handler(void)
         " mrseq r0, msp                                             \n"
         " mrsne r0, psp                                             \n"
         " ldr r1, [r0, #24]                                         \n"
-        " ldr r2, =handler2_address_const                           \n"
+        " ldr r2, handler2_address_const                            \n"
         " bx r2                                                     \n"
+        " .align 4                                                  \n"
         " handler2_address_const: .word prvGetRegistersFromStack    \n"
     );
 }