Add Kinetis interrupt vectors

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3873 42af7a65-404d-4744-a932-0658087f49c3

7 files changed, 39 insertions, 14 deletions

diff --git a/nuttx/configs/kwikstik-k40/README.txt b/nuttx/configs/kwikstik-k40/README.txt
index 3c58a8973..d24a5a473 100644
--- a/nuttx/configs/kwikstik-k40/README.txt
+++ b/nuttx/configs/kwikstik-k40/README.txt
@@ -50,14 +50,11 @@ GNU Toolchain Options
 
   1. The CodeSourcery GNU toolchain,
   2. The devkitARM GNU toolchain,
-  3. Raisonance GNU toolchain, or
-  4. The NuttX buildroot Toolchain (see below).
+  3. The NuttX buildroot Toolchain (see below).
 
-  All testing has been conducted using the NuttX buildroot toolchain.  However,
-  the make system is setup to default to use the devkitARM toolchain.  To use
-  the CodeSourcery, devkitARM or Raisonance GNU toolchain, you simply need to
-  add one of the following configuration options to your .config (or defconfig)
-  file:
+  All testing has been conducted using the CodeSourcery Windows toolchain.  To
+  use the devkitARM or the NuttX GNU toolchain, you simply need to change the
+  the following configuration options to your .config (or defconfig) file:
 
     CONFIG_KINETIS_CODESOURCERYW=y  : CodeSourcery under Windows
     CONFIG_KINETIS_CODESOURCERYL=y  : CodeSourcery under Linux
@@ -67,7 +64,7 @@ GNU Toolchain Options
   If you are not using CONFIG_KINETIS_BUILDROOT, then you may also have to modify
   the PATH in the setenv.h file if your make cannot find the tools.
 
-  NOTE: the CodeSourcery (for Windows), devkitARM, and Raisonance toolchains are
+  NOTE: the CodeSourcery (for Windows) and devkitARM toolchains are
   Windows native toolchains.  The CodeSourcey (for Linux) and NuttX buildroot
   toolchains are Cygwin and/or Linux native toolchains. There are several limitations
   to using a Windows based toolchain in a Cygwin environment.  The three biggest are:
@@ -151,6 +148,9 @@ NuttX buildroot Toolchain
   SourceForge download site (https://sourceforge.net/project/showfiles.php?group_id=189573).
   This GNU toolchain builds and executes in the Linux or Cygwin environment.
 
+  NOTE:  The NuttX toolchain is an OABI toolchain (vs. the more common EABI)
+  and does not include optimizations for Cortex-M4 (ARMv7E-M).
+
   1. You must have already configured Nuttx in <some-dir>/nuttx.
 
      cd tools
@@ -180,7 +180,7 @@ NuttX buildroot Toolchain
 KwikStik-K40-specific Configuration Options
 ============================================
 
-	CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
+	CONFIG_ARCH - Identifies the arch/ subdirectory.  This sould
 	   be set to:
 
 	   CONFIG_ARCH=arm
@@ -200,7 +200,7 @@ KwikStik-K40-specific Configuration Options
 	CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
 	   chip:
 
-	   CONFIG_ARCH_CHIP_K40X256VLQ100
+	   CONFIG_ARCH_CHIP_MK40X256VLQ100
 
 	CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
 	   hence, the board that supports the particular chip or SoC.
diff --git a/nuttx/configs/kwikstik-k40/ostest/Make.defs b/nuttx/configs/kwikstik-k40/ostest/Make.defs
index 314155992..6259f67cb 100644
--- a/nuttx/configs/kwikstik-k40/ostest/Make.defs
+++ b/nuttx/configs/kwikstik-k40/ostest/Make.defs
@@ -58,7 +58,7 @@ endif
 ifeq ($(CONFIG_KINETIS_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
   CROSSDEV = arm-elf-
-  ARCHCPUFLAGS = -mtune=cortex-m4 -march=armv7e-m -mfloat-abi=soft
+  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/nuttx/configs/kwikstik-k40/ostest/defconfig b/nuttx/configs/kwikstik-k40/ostest/defconfig
index cdf2d13e7..c1b450069 100755
--- a/nuttx/configs/kwikstik-k40/ostest/defconfig
+++ b/nuttx/configs/kwikstik-k40/ostest/defconfig
@@ -73,7 +73,7 @@ CONFIG_ARCH=arm
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM4=y
 CONFIG_ARCH_CHIP=kinetis
-CONFIG_ARCH_CHIP_K40X256VLQ100=y
+CONFIG_ARCH_CHIP_MK40X256VLQ100=y
 CONFIG_ARCH_BOARD=kwikstik-k40
 CONFIG_ARCH_BOARD_KWIKSTIK_K40=y
 CONFIG_BOARD_LOOPSPERMSEC=5483
diff --git a/nuttx/configs/kwikstik-k40/src/kwistik-internal.h b/nuttx/configs/kwikstik-k40/src/kwikstik-internal.h
index 46b63b9d0..ce8d3dcae 100755
--- a/nuttx/configs/kwikstik-k40/src/kwistik-internal.h
+++ b/nuttx/configs/kwikstik-k40/src/kwikstik-internal.h
@@ -86,6 +86,18 @@
  ************************************************************************************/
 
 /************************************************************************************
+ * Name: up_ledinit
+ *
+ * Description:
+ *   Initialize LED GPIOs so that LEDs can be controlled.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_ARCH_LEDS
+extern void up_ledinit(void);
+#endif
+
+/************************************************************************************
  * Name: kinetis_spiinitialize
  *
  * Description:
diff --git a/nuttx/configs/kwikstik-k40/src/up_lcd.c b/nuttx/configs/kwikstik-k40/src/up_lcd.c
index c2f911fc1..b4f499f16 100755
--- a/nuttx/configs/kwikstik-k40/src/up_lcd.c
+++ b/nuttx/configs/kwikstik-k40/src/up_lcd.c
@@ -39,8 +39,17 @@
  **************************************************************************************/
 
 #include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <assert.h>
+#include <debug.h>
+
+#include <arch/board/board.h>
+
+#include "up_arch.h"
 #include "kwikstik-internal.h"
 
+
 /**************************************************************************************
  * Pre-processor Definitions
  **************************************************************************************/
diff --git a/nuttx/configs/kwikstik-k40/src/up_leds.c b/nuttx/configs/kwikstik-k40/src/up_leds.c
index 0ad485ec6..d15acf37c 100755
--- a/nuttx/configs/kwikstik-k40/src/up_leds.c
+++ b/nuttx/configs/kwikstik-k40/src/up_leds.c
@@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "kinetis_internal.h"
-#include "kwistik-internal.h"
+#include "kwikstik-internal.h"
 
 /****************************************************************************
  * Definitions
@@ -84,6 +84,10 @@
 
 /****************************************************************************
  * Name: up_ledinit
+ *
+ * Description:
+ *   Initialize LED GPIOs so that LEDs can be controlled.
+ *
  ****************************************************************************/
 
 #ifdef CONFIG_ARCH_LEDS
diff --git a/nuttx/configs/kwikstik-k40/src/up_spi.c b/nuttx/configs/kwikstik-k40/src/up_spi.c
index d5d8865ce..9468c16ae 100755
--- a/nuttx/configs/kwikstik-k40/src/up_spi.c
+++ b/nuttx/configs/kwikstik-k40/src/up_spi.c
@@ -50,7 +50,7 @@
 #include "up_arch.h"
 #include "chip.h"
 #include "kinetis_internal.h"
-#include "kwikstick-internal.h"
+#include "kwikstik-internal.h"
 
 #if defined(CONFIG_KINETIS_SPI1) || defined(CONFIG_KINETIS_SPI2)