diff options
Diffstat (limited to 'os/ports')
| -rw-r--r-- | os/ports/GCC/ARMCMx/STM32F10x/vectors.s | 7 | ||||
| -rw-r--r-- | os/ports/GCC/MSP430/chcore.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/os/ports/GCC/ARMCMx/STM32F10x/vectors.s b/os/ports/GCC/ARMCMx/STM32F10x/vectors.s index 58b0f8aea..0d516fb04 100644 --- a/os/ports/GCC/ARMCMx/STM32F10x/vectors.s +++ b/os/ports/GCC/ARMCMx/STM32F10x/vectors.s @@ -20,6 +20,13 @@ .syntax unified
.thumb
+/* If the macro is not defined in the Makefile then a board.h file must be
+ provided containing the definition of the STM32 family member.*/
+#if !defined(STM32F10X_LD) && !defined(STM32F10X_MD) && \
+ !defined(STM32F10X_HD) && !defined(STM32F10X_CL)
+#include "board.h"
+#endif
+
.section vectors
_vectors:
.word __ram_end__
diff --git a/os/ports/GCC/MSP430/chcore.c b/os/ports/GCC/MSP430/chcore.c index 43528f9c5..6740780a9 100644 --- a/os/ports/GCC/MSP430/chcore.c +++ b/os/ports/GCC/MSP430/chcore.c @@ -51,7 +51,7 @@ void port_switch(Thread *ntp, Thread *otp) { "push r8 \n\t" \
"push r7 \n\t" \
"push r6 \n\t" \
- "push r6 \n\t" \
+ "push r5 \n\t" \
"push r4");
otp->p_ctx.sp = sp;
sp = ntp->p_ctx.sp;
|