summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/sam34/sam_vectors.S
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-06-12 10:56:42 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-06-12 10:56:42 -0600
commit9deb3f90a3569cd328565e322c2f4dbeaa6f151f (patch)
tree83a6a80d5e1d6edae7f0e830031d387bd7450681 /nuttx/arch/arm/src/sam34/sam_vectors.S
parent537877aa6db12c6961a1d0afbb19ffd35a253764 (diff)
downloadpx4-nuttx-9deb3f90a3569cd328565e322c2f4dbeaa6f151f.tar.gz
px4-nuttx-9deb3f90a3569cd328565e322c2f4dbeaa6f151f.tar.bz2
px4-nuttx-9deb3f90a3569cd328565e322c2f4dbeaa6f151f.zip
SAM4S: Add NSH configuration. Calibrated delay loops. Port now seems fully functional
Diffstat (limited to 'nuttx/arch/arm/src/sam34/sam_vectors.S')
-rw-r--r--nuttx/arch/arm/src/sam34/sam_vectors.S10
1 files changed, 7 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/sam34/sam_vectors.S b/nuttx/arch/arm/src/sam34/sam_vectors.S
index 007367857..25608a41c 100644
--- a/nuttx/arch/arm/src/sam34/sam_vectors.S
+++ b/nuttx/arch/arm/src/sam34/sam_vectors.S
@@ -128,14 +128,16 @@ sam_vectors:
#define VECTOR(l,i) .word l
#undef UNUSED
-#define UNUSED(i) .word stm32_reserved
+#define UNUSED(i) .word sam_reserved
#if defined(CONFIG_ARCH_CHIP_SAM3U)
# include "chip/sam3u_vectors.h"
#elif defined(CONFIG_ARCH_CHIP_SAM4L)
# include "chip/sam4l_vectors.h"
+#elif defined(CONFIG_ARCH_CHIP_SAM4S)
+# include "chip/sam4s_vectors.h"
#else
-# Unrecognized SAM architecture
+# error Unrecognized SAM architecture
#endif
.size sam_vectors, .-sam_vectors
@@ -169,8 +171,10 @@ handlers:
# include "chip/sam3u_vectors.h"
#elif defined(CONFIG_ARCH_CHIP_SAM4L)
# include "chip/sam4l_vectors.h"
+#elif defined(CONFIG_ARCH_CHIP_SAM4S)
+# include "chip/sam4s_vectors.h"
#else
-# Unrecognized SAM architecture
+# error Unrecognized SAM architecture
#endif
/* Common IRQ handling logic. On entry here, the return stack is on either