summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/kinetis/kinetis_vectors.S
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-03-22 16:19:59 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-03-22 16:19:59 +0000
commitf91a1aac610192984326a4d0e77796c1419f8ca1 (patch)
tree738775612118ff38be1b1816e2ce02d45d3211f2 /nuttx/arch/arm/src/kinetis/kinetis_vectors.S
parentd27a58798955bad789da8f89acadf8c4341c2ecb (diff)
downloadnuttx-f91a1aac610192984326a4d0e77796c1419f8ca1.tar.gz
nuttx-f91a1aac610192984326a4d0e77796c1419f8ca1.tar.bz2
nuttx-f91a1aac610192984326a4d0e77796c1419f8ca1.zip
Add a OS test kernel build configuration for the STM32F4Discovery board
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5775 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/kinetis/kinetis_vectors.S')
-rw-r--r--nuttx/arch/arm/src/kinetis/kinetis_vectors.S11
1 files changed, 3 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/kinetis/kinetis_vectors.S b/nuttx/arch/arm/src/kinetis/kinetis_vectors.S
index 11ac46221..055841d5a 100644
--- a/nuttx/arch/arm/src/kinetis/kinetis_vectors.S
+++ b/nuttx/arch/arm/src/kinetis/kinetis_vectors.S
@@ -41,6 +41,8 @@
#include <nuttx/config.h>
#include <arch/irq.h>
+#include "exc_return.h"
+
/************************************************************************************************
* Preprocessor Definitions
************************************************************************************************/
@@ -59,13 +61,6 @@
#define IDLE_STACK (_ebss+CONFIG_IDLETHREAD_STACKSIZE)
#define HEAP_BASE (_ebss+CONFIG_IDLETHREAD_STACKSIZE)
-/* The Cortex-M4 return from interrupt is unusual. We provide the following special
- * address to the BX instruction. The particular value also forces a return to
- * thread mode and covers state from the main stack point, the MSP (vs. the MSP).
- */
-
-#define EXC_RETURN 0xfffffff9
-
/************************************************************************************************
* Global Symbols
************************************************************************************************/
@@ -690,7 +685,7 @@ kinetis_common:
* actually occurs with interrupts still disabled).
*/
- ldr r14, =EXC_RETURN /* Load the special value */
+ ldr r14, =EXC_RETURN_PRIVTHR /* Load the special value */
#endif
/* Restore the interrupt state */