diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-20 12:33:49 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-08-20 12:33:49 +0000 |
| commit | abbc1097778c5718dd314af045f40b037ccb4cb5 (patch) | |
| tree | bfc682e218ca81dbe5d2ab4d573a75b942d8f6fd /os/rt | |
| parent | 3e25612cb510bc0518b1748e4dfb820bb5470d8b (diff) | |
| download | ChibiOS-abbc1097778c5718dd314af045f40b037ccb4cb5.tar.gz ChibiOS-abbc1097778c5718dd314af045f40b037ccb4cb5.tar.bz2 ChibiOS-abbc1097778c5718dd314af045f40b037ccb4cb5.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6188 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/rt')
| -rw-r--r-- | os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s | 5 | ||||
| -rw-r--r-- | os/rt/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s index a8c0d34cf..7fe77c57f 100644 --- a/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s +++ b/os/rt/ports/ARMCMx/compilers/GCC/chcoreasm_v6m.s @@ -120,8 +120,9 @@ _port_switch_from_isr: #endif
.globl _port_exit_from_isr
_port_exit_from_isr:
- ldr r3, .L2
- ldr r2, .L3
+ ldr r2, .L2
+ ldr r3, .L3
+ str r3, [r2, #0]
#if CORTEX_ALTERNATE_SWITCH
cpsie i
#endif
diff --git a/os/rt/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld b/os/rt/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld index 31c34bbf2..e79774f45 100644 --- a/os/rt/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld +++ b/os/rt/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld @@ -34,7 +34,7 @@ __ram_start__ = ORIGIN(ram); __ram_size__ = LENGTH(ram);
__ram_end__ = __ram_start__ + __ram_size__;
-ENTRY(ResetHandler)
+ENTRY(Reset_Handler)
SECTIONS
{
|