diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-22 16:19:59 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-22 16:19:59 +0000 |
| commit | f91a1aac610192984326a4d0e77796c1419f8ca1 (patch) | |
| tree | 738775612118ff38be1b1816e2ce02d45d3211f2 /nuttx/arch/arm/src/stm32 | |
| parent | d27a58798955bad789da8f89acadf8c4341c2ecb (diff) | |
| download | nuttx-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/stm32')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_allocateheap.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_vectors.S | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_allocateheap.c b/nuttx/arch/arm/src/stm32/stm32_allocateheap.c index 3eed90dd4..e6ba2b947 100644 --- a/nuttx/arch/arm/src/stm32/stm32_allocateheap.c +++ b/nuttx/arch/arm/src/stm32/stm32_allocateheap.c @@ -48,8 +48,10 @@ #include <arch/board/board.h> #include "chip.h" +#include "mpu.h" #include "up_arch.h" #include "up_internal.h" +#include "stm32_mpuinit.h" /**************************************************************************** * Private Definitions diff --git a/nuttx/arch/arm/src/stm32/stm32_vectors.S b/nuttx/arch/arm/src/stm32/stm32_vectors.S index c81ae74f5..6ecd92b74 100644 --- a/nuttx/arch/arm/src/stm32/stm32_vectors.S +++ b/nuttx/arch/arm/src/stm32/stm32_vectors.S @@ -43,6 +43,7 @@ #include <arch/irq.h> #include "chip.h" +#include "exc_return.h" /************************************************************************************ * Configuration @@ -72,13 +73,6 @@ #define IDLE_STACK (_ebss+CONFIG_IDLETHREAD_STACKSIZE-4) #define HEAP_BASE (_ebss+CONFIG_IDLETHREAD_STACKSIZE) -/* The Cortex-M3 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 ************************************************************************************/ @@ -387,7 +381,7 @@ stm32_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 */ |