From 4691fbd207362f6ff7df11dc0b4b5c1df5f3242e Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 12 Jun 2013 19:42:39 -0600
Subject: Correct border colors for SAM3U-EK border; clean up some comments;
 make sure that sam_vectors.S is identical to stam32_vectors.S

---
 nuttx/arch/arm/src/sam34/sam_allocateheap.c |  2 +-
 nuttx/arch/arm/src/sam34/sam_vectors.S      | 15 ++++++++++-----
 nuttx/configs/sam3u-ek/nx/defconfig         |  8 ++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/nuttx/arch/arm/src/sam34/sam_allocateheap.c b/nuttx/arch/arm/src/sam34/sam_allocateheap.c
index 2c350d860..edacfc617 100644
--- a/nuttx/arch/arm/src/sam34/sam_allocateheap.c
+++ b/nuttx/arch/arm/src/sam34/sam_allocateheap.c
@@ -66,7 +66,7 @@
 #endif
 
 #if CONFIG_MM_REGIONS > 2 && defined(CONFIG_SAM34_NAND)
-#  error "CONFIG_MM_REGIONS > 3 but cannot used NFC SRAM"
+#  error "CONFIG_MM_REGIONS > 2 but cannot use NFC SRAM"
 #  undef CONFIG_MM_REGIONS
 #  define CONFIG_MM_REGIONS 2
 #endif
diff --git a/nuttx/arch/arm/src/sam34/sam_vectors.S b/nuttx/arch/arm/src/sam34/sam_vectors.S
index 25608a41c..c6a11b31e 100644
--- a/nuttx/arch/arm/src/sam34/sam_vectors.S
+++ b/nuttx/arch/arm/src/sam34/sam_vectors.S
@@ -61,19 +61,23 @@
  * 0x2000:bfff - End of SRAM and end of heap
  */
 
-#define IDLE_STACK		(_ebss+CONFIG_IDLETHREAD_STACKSIZE)
+#define IDLE_STACK		(_ebss+CONFIG_IDLETHREAD_STACKSIZE-4)
 #define HEAP_BASE		(_ebss+CONFIG_IDLETHREAD_STACKSIZE)
 
 /************************************************************************************************
  * Global Symbols
  ************************************************************************************************/
 
-	.globl		__start
-
 	.syntax		unified
 	.thumb
 	.file		"sam_vectors.S"
 
+/* Check if common ARMv7 interrupt vectoring is used (see arch/arm/src/armv7-m/up_vectors.S) */
+
+#ifndef CONFIG_ARMV7M_CMNVECTOR
+
+	.globl		__start
+
 /************************************************************************************************
  * Macros
  ************************************************************************************************/
@@ -297,8 +301,8 @@ sam_common:
 #endif
 
 	/* We are returning with a pending context switch.  This case is different
-	 * because in this case, the register save structure does not lie on the
-	 * stack but, rather, are within a TCB structure.  We'll have to copy some
+	 * because in this case, the register save structure does not lie in the
+	 * stack but, rather, within a TCB structure.  We'll have to copy some
 	 * values to the stack.
 	 */
 
@@ -405,6 +409,7 @@ up_interruptstack:
 g_intstackbase:
 	.size	up_interruptstack, .-up_interruptstack
 #endif
+#endif /* CONFIG_ARMV7M_CMNVECTOR */
 
 /************************************************************************************************
  * .rodata
diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig
index bce6f444a..feb302b27 100644
--- a/nuttx/configs/sam3u-ek/nx/defconfig
+++ b/nuttx/configs/sam3u-ek/nx/defconfig
@@ -190,7 +190,7 @@ CONFIG_BOARD_LOOPSPERMSEC=4768
 CONFIG_DRAM_START=0x20000000
 CONFIG_DRAM_SIZE=32768
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
-CONFIG_ARCH_INTERRUPTSTACK=0
+CONFIG_ARCH_INTERRUPTSTACK=1024
 
 #
 # Boot options
@@ -423,9 +423,9 @@ CONFIG_NX_KBD=y
 # Framed Window Borders
 #
 CONFIG_NXTK_BORDERWIDTH=4
-CONFIG_NXTK_BORDERCOLOR1=0
-CONFIG_NXTK_BORDERCOLOR2=0
-CONFIG_NXTK_BORDERCOLOR3=0
+CONFIG_NXTK_BORDERCOLOR1=0x5cb7
+CONFIG_NXTK_BORDERCOLOR2=0x21c9
+CONFIG_NXTK_BORDERCOLOR3=0xffdf
 # CONFIG_NXTK_AUTORAISE is not set
 
 #
-- 
cgit v1.2.3