Misc changes for clean compilation of freedom-kl25z config

14 files changed, 220 insertions, 545 deletions

diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig
index 8215bdc53..c9b655d3a 100644
--- a/nuttx/arch/arm/Kconfig
+++ b/nuttx/arch/arm/Kconfig
@@ -170,6 +170,7 @@ config ARCH_CHIP
 	default "dm320"		if ARCH_CHIP_DM320
 	default "imx"		if ARCH_CHIP_IMX
 	default "kinetis"	if ARCH_CHIP_KINETIS
+	default "kl"		if ARCH_CHIP_KL
 	default "lm"		if ARCH_CHIP_LM
 	default "lpc17xx"	if ARCH_CHIP_LPC17XX
 	default "lpc214x"	if ARCH_CHIP_LPC214X
@@ -300,6 +301,9 @@ endif
 if ARCH_CHIP_KINETIS
 source arch/arm/src/kinetis/Kconfig
 endif
+if ARCH_CHIP_KL
+source arch/arm/src/kl/Kconfig
+endif
 if ARCH_CHIP_LM
 source arch/arm/src/lm/Kconfig
 endif
diff --git a/nuttx/arch/arm/src/kl/Kconfig b/nuttx/arch/arm/src/kl/Kconfig
index 3d69482a1..7f1910963 100644
--- a/nuttx/arch/arm/src/kl/Kconfig
+++ b/nuttx/arch/arm/src/kl/Kconfig
@@ -289,6 +289,15 @@ config KL_PIT
 
 endmenu
 
+choice
+	prompt "SysTick clock source"
+	default KL_SYSTICK_CORECLK
+
+config KL_SYSTICK_CORECLK
+	bool "Cortex-M0 core clock"
+
+endchoice
+
 comment "Kinetis GPIO Interrupt Configuration"
 
 config GPIO_IRQ
diff --git a/nuttx/arch/arm/src/kl/kl_clockconfig.c b/nuttx/arch/arm/src/kl/kl_clockconfig.c
index 25679243b..7d04b9a4b 100644
--- a/nuttx/arch/arm/src/kl/kl_clockconfig.c
+++ b/nuttx/arch/arm/src/kl/kl_clockconfig.c
@@ -45,7 +45,7 @@
 #include "up_arch.h"
 
 #include "chip.h"
-#include "chip/kl_internal.h"
+#include "kl_internal.h"
 #include "chip/kl_mcg.h"
 #include "chip/kl_sim.h"
 #include "chip/kl_osc.h"
diff --git a/nuttx/arch/arm/src/kl/kl_clockconfig.c_orig b/nuttx/arch/arm/src/kl/kl_clockconfig.c_orig
deleted file mode 100644
index f595f3210..000000000
--- a/nuttx/arch/arm/src/kl/kl_clockconfig.c_orig
+++ /dev/null
@@ -1,209 +0,0 @@
-/****************************************************************************
- * arch/arm/src/kl/kl_clockconfig.c
- * arch/arm/src/chip/kl_clockconfig.c
- *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <arch/board/board.h>
-
-#include "up_arch.h"
-
-#include "chip.h"
-#include "chip/kl_internal.h"
-#include "chip/kl_mcg.h"
-#include "chip/kl_sim.h"
-#include "chip/kl_osc.h"
-#include "chip/kl_fmc.h"
-#include "chip/kl_llwu.h"
-#include "chip/kl_pinmux.h"
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: kl_portclocks
- *
- * Description:
- *   Enable all of the port clocks
- *
- ****************************************************************************/
-
-static inline void kl_portclocks(void)
-{
-  uint32_t regval;
-
-  /* Enable all of the port clocks */
-
-  regval = getreg32(KL_SIM_SCGC5);
-  regval |= (SIM_SCGC5_PORTA | SIM_SCGC5_PORTB | SIM_SCGC5_PORTC |
-             SIM_SCGC5_PORTD | SIM_SCGC5_PORTE);
-  putreg32(regval, KL_SIM_SCGC5);
-}
-
-/****************************************************************************
- * Name: kl_pllconfig
- *
- * Description:
- *   Initialize the PLL using the settings in board.h.  This assumes that
- *   the MCG is in default FLL Engaged Internal (FEI mode) out of reset.
- *
- ****************************************************************************/
-
-void kl_pllconfig(void)
-{
-  uint32_t regval32;
-  uint8_t regval8;
-
-  /* Enable clock gate to Port A module to enable pin routing (PORTA=1) */
-  regval32 = getreg32(KL_SIM_SCGC5);
-  regval32 |= SIM_SCGC5_PORTA;
-  putreg32(regval32, KL_SIM_SCGC5);
-
-  /* Divide-by-2 for clock 1 and clock 4 (OUTDIV1=1, OUTDIV4=1) */
-  regval32 = (SIM_CLKDIV1_OUTDIV1(1) | SIM_CLKDIV1_OUTDIV4(1));
-  putreg32(regval32, KL_SIM_CLKDIV1);
-
-  /* System oscillator drives 32 kHz clock for various peripherals (OSC32KSEL=0) */
-  regval32 = getreg32(KL_SIM_SOPT1);
-  regval32 &= ~(SIM_SOPT1_OSC32KSEL);
-  putreg32(regval32, KL_SIM_SOPT1);
-
-  /* Select PLL as a clock source for various peripherals (PLLFLLSEL=1)
-     Clock source for TPM counter clock is MCGFLLCLK or MCGPLLCLK/2 */
-  regval32 = getreg32(KL_SIM_SOPT2);
-  regval32 |= SIM_SOPT2_PLLFLLSEL;
-  putreg32(regval32, KL_SIM_SOPT2);
-  regval32 = (regval32 & ~(SIM_SOPT2_TPMSRC_OCSERCLK)) | SIM_SOPT2_TPMSRC_MCGCLK;
-  putreg32(regval32, KL_SIM_SOPT2);
-
-  /* PORTA_PCR18: ISF=0,MUX=0 */
-  /* PORTA_PCR19: ISF=0,MUX=0 */
-  regval32 = getreg32(KL_PORTA_PCR18);
-  regval32 = ~(PORT_PCR_ISF | PORT_PCR_MUX_ALT7);
-  putreg32(regval32, KL_PORTA_PCR18);  
-  regval32 = getreg32(KL_PORTA_PCR19);
-  regval32 = ~(PORT_PCR_ISF | PORT_PCR_MUX_ALT7);
-  putreg32(regval32, KL_PORTA_PCR19);  
-
-  /* Switch to FBE Mode */
-  /* OSC0_CR: ERCLKEN=0,??=0,EREFSTEN=0,??=0,SC2P=0,SC4P=0,SC8P=0,SC16P=0 */
-  putreg8(0, KL_OSC_CR);
-  /* MCG_C2: LOCRE0=0,??=0,RANGE0=2,HGO0=0,EREFS0=1,LP=0,IRCS=0 */
-  regval8 = (MCG_C2_RANGE_VHIGH | MCG_C2_EREFS);
-  putreg8(regval8, KL_MCG_C2);
-  /* MCG_C1: CLKS=2,FRDIV=3,IREFS=0,IRCLKEN=0,IREFSTEN=0 */
-  regval8 = (MCG_C1_CLKS_EXTREF | MCG_C1_FRDIV_R0DIV8);
-  putreg8(regval8, KL_MCG_C1);
-  /* MCG_C4: DMX32=0,DRST_DRS=0 */
-  regval8 = ~(MCG_C4_DMX32 | MCG_C4_DRST_DRS_HIGH);
-  putreg8(regval8, KL_MCG_C4);
-  /* MCG_C5: ??=0,PLLCLKEN0=0,PLLSTEN0=0,PRDIV0=1 */
-  regval8 = MCG_C5_PRDIV(1);
-  putreg8(regval8, KL_MCG_C5);
-  /* MCG_C6: LOLIE0=0,PLLS=0,CME0=0,VDIV0=0 */
-  putreg8(0, KL_MCG_C6);
-  
-  /* Check that the source of the FLL reference clock is
-     the external reference clock. */
-  while((getreg8(KL_MCG_S) & MCG_S_IREFST) != 0)
-    ;
-
-  /* Wait until external reference */
-  while((getreg8(KL_MCG_S) & MCG_S_CLKST_MASK) != 8)
-    ;
-
-  /* Switch to PBE mode
-     Select PLL as MCG source (PLLS=1) */
-  putreg8(MCG_C6_PLLS, KL_MCG_C6);
-  /* Wait until PLL locked */
-  while((getreg8(KL_MCG_S) & MCG_S_LOCK) == 0)
-    ;
-
-  /* Switch to PEE mode
-     Select PLL output (CLKS=0)
-     FLL external reference divider (FRDIV=3)
-     External reference clock for FLL (IREFS=0) */
-  putreg8(MCG_C1_FRDIV_R0DIV8, KL_MCG_C1);
-
-  /* Wait until PLL output */
-  while((getreg8(KL_MCG_S) & MCG_S_CLKST_MASK) != 0x0C)
-    ;
-}
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: kl_clockconfig
- *
- * Description:
- *   Called to initialize the Kinetis chip.  This does whatever setup is
- *   needed to put the  MCU in a usable state.  This includes the
- *   initialization of clocking using the settings in board.h.
- *
- ****************************************************************************/
-
-void kl_clockconfig(void)
-{
-  /* Enable all of the port clocks */
-
-  //kl_portclocks();
-
-  /* Configure the PLL based on settings in the board.h file */
-
-  kl_pllconfig();
-
-  /* For debugging, we will normally want to enable the trace clock and/or
-   * the FlexBus clock.
-   */
-
-  //kl_traceconfig();
-  //kl_fbconfig();
-}
-
diff --git a/nuttx/arch/arm/src/kl/chip/kl_internal.h b/nuttx/arch/arm/src/kl/kl_internal.h
index 3fb16afc6..9f6219b89 100644
--- a/nuttx/arch/arm/src/kl/chip/kl_internal.h
+++ b/nuttx/arch/arm/src/kl/kl_internal.h
@@ -52,7 +52,7 @@
 #include "up_internal.h"
 #include "kl_config.h"
 #include "chip.h"
-#include "kl_port.h"
+#include "chip/kl_port.h"
 
 /************************************************************************************
  * Definitions
diff --git a/nuttx/arch/arm/src/kl/kl_lowputc.c b/nuttx/arch/arm/src/kl/kl_lowputc.c
index d19eba1de..33aab79e0 100644
--- a/nuttx/arch/arm/src/kl/kl_lowputc.c
+++ b/nuttx/arch/arm/src/kl/kl_lowputc.c
@@ -48,8 +48,8 @@
 #include "up_arch.h"
 
 #include "kl_config.h"
-//#include "kl_lowputc.h"
-//#include "chip/kl_internal.h"
+#include "kl_lowputc.h"
+#include "kl_internal.h"
 #include "chip/kl_uart.h"
 #include "chip/kl_sim.h"
 #include "chip/kl_port.h"
@@ -109,7 +109,7 @@ static uint8_t g_sizemap[8] = {1, 4, 8, 16, 32, 64, 128, 0};
  *
  **************************************************************************/
 
-void kl_lowputc(char ch)
+void kl_lowputc(uint32_t ch)
 {
 #if defined HAVE_UART_DEVICE && defined HAVE_SERIAL_CONSOLE
 #ifdef CONFIG_KL_UARTFIFOS
diff --git a/nuttx/arch/arm/src/kl/kl_serial.c b/nuttx/arch/arm/src/kl/kl_serial.c
index 1a110ae90..caaa2c8af 100644
--- a/nuttx/arch/arm/src/kl/kl_serial.c
+++ b/nuttx/arch/arm/src/kl/kl_serial.c
@@ -62,7 +62,8 @@
 #include "kl_lowputc.h"
 #include "chip.h"
 #include "chip/kl_uart.h"
-//#include "kl_internal.h"
+
+#include "kl_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/nuttx/arch/arm/src/kl/kl_start.c b/nuttx/arch/arm/src/kl/kl_start.c
index 7857cc01a..9a55a1750 100644
--- a/nuttx/arch/arm/src/kl/kl_start.c
+++ b/nuttx/arch/arm/src/kl/kl_start.c
@@ -52,8 +52,8 @@
 
 #include "kl_config.h"
 #include "kl_lowputc.h"
-//#include "kl_clockconfig.h"
 #include "kl_userspace.h"
+#include "kl_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -104,8 +104,10 @@ const uint32_t g_idle_topstack = HEAP_BASE;
 
 void iprintf(const char *string)
 {
-   while(*string != NULL)
-        kl_lowputc((char) *string++);
+  while(*string != '\0')
+    {
+      kl_lowputc((char) *string++);
+    }
 }
 
 /****************************************************************************
@@ -119,8 +121,9 @@ void iprintf(const char *string)
 void __start(void)
 {
   const uint32_t *src;
-  uint32_t *dest, i=0;
+  uint32_t *dest;
   volatile unsigned int *SIM_COPC = ((volatile unsigned int *)0x40048100);
+  //int i = 0;
 
   /*acassis: disable SIM_COP*/
   *SIM_COPC = 0;
diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig
index 2ef27ea23..d2509d0e0 100644
--- a/nuttx/configs/Kconfig
+++ b/nuttx/configs/Kconfig
@@ -137,15 +137,13 @@ config ARCH_BOARD_EZ80F910200ZCO
 		development kit, eZ80F091 part, and the Zilog ZDS-II Windows command line
 		tools.  The development environment is Cygwin under WinXP.
 
-config ARCH_BOARD_FIRE_STM32
-	bool "M3 Wildfire STM3 board (v2 or v3)"
-	depends on ARCH_CHIP_STM32F103VET6
+config ARCH_BOARD_FREEDOM_KL25Z
+	bool "Freescale Freedom KL25Z"
+	depends on ARCH_CHIP_MKL25Z128
 	select ARCH_HAVE_LEDS
-	select ARCH_HAVE_BUTTONS
-	select ARCH_HAVE_IRQBUTTONS
 	---help---
-		A configuration for the M3 Wildfile board.  This board is based on the
-		STM32F103VET6 chip.  See http://firestm32.taobao.com
+		This is the configuration for the Freescale Freedom KL25Z board.  This
+		board has the K25Z120LE3AN chip with a built-in SDA debugger.
 
 config ARCH_BOARD_HYMINI_STM32V
 	bool "HY-Mini STM32v board"
@@ -708,6 +706,7 @@ config ARCH_BOARD
 	default "ez80f910200kitg"     if ARCH_BOARD_EZ80F910200KITG
 	default "ez80f910200zco"      if ARCH_BOARD_EZ80F910200ZCO
 	default "fire-stm32v2"        if ARCH_BOARD_FIRE_STM32
+	default "freedom-kl25z"        if ARCH_BOARD_FREEDOM_KL25Z
 	default "hymini-stm32v"       if ARCH_BOARD_HYMINI_STM32V
 	default "kwikstik-k40"        if ARCH_BOARD_KWIKSTIK_K40
 	default "lincoln60"           if ARCH_BOARD_LINCOLN60
diff --git a/nuttx/configs/freedom-kl25z/README.txt b/nuttx/configs/freedom-kl25z/README.txt
index 7929668c5..a650cb873 100644
--- a/nuttx/configs/freedom-kl25z/README.txt
+++ b/nuttx/configs/freedom-kl25z/README.txt
@@ -2,8 +2,8 @@ README.txt
 ==========
 
 This is the README file for the port of NuttX to the Freescale
-Freedom K25Z board.  This board has the K25Z120LE3AN chip
-with a built-in NuLink debugger.
+Freedom KL25Z board.  This board has the K25Z120LE3AN chip
+with a built-in SDA debugger.
 
 Contents
 ========
@@ -95,16 +95,16 @@ LEDs
 Serial Console
 ==============
 
-As with most NuttX configurations, the Freedom K25Z configurations
+As with most NuttX configurations, the Freedom KL25Z configurations
 depend on having a serial console to interact with the software.  The
-Freedom K25Z, however, has not on-board RS-232 drivers so will be
-necessary to connect the Freedom K25Z UART pins to an external
+Freedom KL25Z, however, has not on-board RS-232 drivers so will be
+necessary to connect the Freedom KL25Z UART pins to an external
 RS-232 driver board or TTL-to-Serial USB adaptor.
 
 By default UART1 is used as the serial console on these boards.  K25Z120LE3AN
 is provided as an LQFP48 package and, for this case, the UART1 RX signal
 (RXD1) is on PB.4, pin 8, and the TX signal (TXD1) is on PB.5, pin 9.
-These pins are available on the Freedom K25Z JP5.
+These pins are available on the Freedom KL25Z JP5.
 
   NOTE: The TX vs RX labeling may be confusing.  On one RS-232 driver board,
   I had to connect the K25Z120 TXD0 pin to the driver boards RXD pin.  How
@@ -112,7 +112,7 @@ These pins are available on the Freedom K25Z JP5.
 
 UART0 is an alternative that can be selected by modifying the default
 configuation.  UART0 RX (RXD0) is on PB.0, pin 17, and the TX signal (TXD0)
-is on PB.1, pin 18.  These pins are available on the Freedom K25Z JP1.
+is on PB.1, pin 18.  These pins are available on the Freedom KL25Z JP1.
 
   NOTE: PB.0, pin 17, is also used to control the user LED on board (labeled
   "IO").  CONFIG_ARCH_LED should not be selected if UART0 is used.
@@ -122,7 +122,7 @@ The K25Z120LE3AN does not support UART2.
 Debugging
 =========
 
-The Freedom K25Z includes a built-in NuLink debugger.  Unfortunately,
+The Freedom KL25Z includes a built-in SDA debugger.  Unfortunately,
 full debug support is available only with the Keil and IAR toolchains.
 There is, however, a free program called ICP (In-Circuit Programmer).  It
 can be used to burn programs into FLASH (aka APROM).
diff --git a/nuttx/configs/freedom-kl25z/include/board.h b/nuttx/configs/freedom-kl25z/include/board.h
index 7a17570c4..d82517a49 100644
--- a/nuttx/configs/freedom-kl25z/include/board.h
+++ b/nuttx/configs/freedom-kl25z/include/board.h
@@ -266,16 +266,16 @@ extern "C" {
  * Public Function Prototypes
  ************************************************************************************/
 /************************************************************************************
- * Name: kinetis_boardinitialize
+ * Name: kl_boardinitialize
  *
  * Description:
- *   All STM32 architectures must provide the following entry point.  This entry point
- *   is called early in the intitialization -- after all memory has been configured
- *   and mapped but before any devices have been initialized.
+ *   All Kinetis L architectures must provide the following entry point.  This entry
+ *   point is called early in the intitialization -- after all memory has been
+ *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
-EXTERN void kinetis_boardinitialize(void);
+void kl_boardinitialize(void);
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/nuttx/configs/freedom-kl25z/nsh/defconfig b/nuttx/configs/freedom-kl25z/nsh/defconfig
index b9071686b..c7d279994 100644
--- a/nuttx/configs/freedom-kl25z/nsh/defconfig
+++ b/nuttx/configs/freedom-kl25z/nsh/defconfig
@@ -12,10 +12,6 @@ CONFIG_HOST_LINUX=y
 # CONFIG_HOST_OSX is not set
 # CONFIG_HOST_WINDOWS is not set
 # CONFIG_HOST_OTHER is not set
-# CONFIG_WINDOWS_NATIVE is not set
-# CONFIG_WINDOWS_CYGWIN is not set
-# CONFIG_WINDOWS_MSYS is not set
-# CONFIG_WINDOWS_OTHER is not set
 
 #
 # Build Configuration
@@ -42,8 +38,7 @@ CONFIG_RAW_BINARY=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
-CONFIG_DEBUG_SCHED=y
+# CONFIG_DEBUG is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
@@ -70,13 +65,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_IMX is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
+CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
 # CONFIG_ARCH_CHIP_LPC31XX is not set
 # CONFIG_ARCH_CHIP_LPC43XX is not set
-CONFIG_ARCH_CHIP_KL=y
+# CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAM3U is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
@@ -86,93 +82,74 @@ CONFIG_ARCH_CHIP="kl"
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARCH_HAVE_MPU is not set
-CONFIG_BOARD_LOOPSPERMSEC=2988
-# CONFIG_ARCH_CALIBRATION is not set
 
 #
 # ARMV6M Configuration Options
 #
-# CONFIG_ARMV6M_TOOLCHAIN_ATOLLIC is not set
-# CONFIG_ARMV6M_TOOLCHAIN_BUILDROOT is not set
-# CONFIG_ARMV6M_TOOLCHAIN_CODEREDW is not set
-# CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYW is not set
-# CONFIG_ARMV6M_TOOLCHAIN_DEVKITARM is not set
-CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI=y
-
-#
-# KL25Z128/120 Configuration Options
-#
-# CONFIG_ARCH_CHIP_KL25Z128LC1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD2BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RC1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RD1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RD2BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LE3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RD3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RE3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VD2AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VD3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VE3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LC1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD2BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RC1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RD1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RD2BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD3AN is not set
+CONFIG_ARMV6M_TOOLCHAIN_BUILDROOT=y
+# CONFIG_ARMV6M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYL is not set
+# CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI is not set
+# CONFIG_GPIO_IRQ is not set
+
+#
+# Kinetis Configuration Options
+#
 CONFIG_ARCH_CHIP_MKL25Z128=y
-# CONFIG_ARCH_CHIP_KL25Z128RD3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RE3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VD2AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VD3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VE3AN is not set
-CONFIG_ARCH_FAMILY_L20=y
+CONFIG_ARCH_FAMILY_KL2X=y
 
 #
-# KL25Z Peripheral Support
+# Kinetis Peripheral Support
 #
-# CONFIG_KL_PDMA is not set
-# CONFIG_KL_FMC is not set
-# CONFIG_KL_EBI is not set
-# CONFIG_KL_WDT is not set
-# CONFIG_KL_RTC is not set
-# CONFIG_KL_TMR0 is not set
-# CONFIG_KL_TMR1 is not set
-# CONFIG_KL_TIMR2 is not set
-# CONFIG_KL_TIMR3 is not set
-# CONFIG_KL_I2C0 is not set
-# CONFIG_KL_I2C1 is not set
+# CONFIG_KL_TRACE is not set
+# CONFIG_KL_FLEXBUS is not set
+CONFIG_KL_UART0=y
+# CONFIG_KL_UART1 is not set
+# CONFIG_KL_UART2 is not set
+# CONFIG_KL_UART3 is not set
+# CONFIG_KL_UART4 is not set
+# CONFIG_KL_UART5 is not set
+# CONFIG_KL_FLEXCAN0 is not set
+# CONFIG_KL_FLEXCAN1 is not set
 # CONFIG_KL_SPI0 is not set
 # CONFIG_KL_SPI1 is not set
 # CONFIG_KL_SPI2 is not set
-# CONFIG_KL_SPI3 is not set
-# CONFIG_KL_PWM0 is not set
-# CONFIG_KL_PWM1 is not set
-# CONFIG_KL_PWM2 is not set
-# CONFIG_KL_PWM3 is not set
-# CONFIG_KL_PWM4 is not set
-# CONFIG_KL_PWM5 is not set
-# CONFIG_KL_PWM6 is not set
-# CONFIG_KL_PWM7 is not set
-CONFIG_KL_UART0=y
-# CONFIG_KL_UART1 is not set
-# CONFIG_KL_USBD is not set
-# CONFIG_KL_ACMP is not set
-# CONFIG_KL_ADC is not set
-# CONFIG_KL_PS2 is not set
+# CONFIG_KL_I2C0 is not set
+# CONFIG_KL_I2C1 is not set
 # CONFIG_KL_I2S is not set
-CONFIG_KL_INTHI=y
+# CONFIG_KL_DAC0 is not set
+# CONFIG_KL_DAC1 is not set
+# CONFIG_KL_ADC0 is not set
+# CONFIG_KL_ADC1 is not set
+# CONFIG_KL_CMP is not set
+# CONFIG_KL_VREF is not set
+# CONFIG_KL_SDHC is not set
+# CONFIG_KL_FTM0 is not set
+# CONFIG_KL_FTM1 is not set
+# CONFIG_KL_FTM2 is not set
+# CONFIG_KL_LPTIMER is not set
+# CONFIG_KL_RTC is not set
+# CONFIG_KL_EWM is not set
+# CONFIG_KL_CMT is not set
+# CONFIG_KL_USBOTG is not set
+# CONFIG_KL_USBDCD is not set
+# CONFIG_KL_LLWU is not set
+# CONFIG_KL_TSI is not set
+# CONFIG_KL_FTFL is not set
+# CONFIG_KL_DMA is not set
+# CONFIG_KL_CRC is not set
+# CONFIG_KL_PDB is not set
+# CONFIG_KL_PIT is not set
 CONFIG_KL_SYSTICK_CORECLK=y
-# CONFIG_KL_SYSTICK_XTALHI is not set
-# CONFIG_KL_SYSTICK_XTALLO is not set
-# CONFIG_KL_SYSTICK_XTALHId2 is not set
-# CONFIG_KL_SYSTICK_HCLKd2 is not set
-# CONFIG_KL_SYSTICK_INTHId2 is not set
-# CONFIG_KL_UARTCLK_XTALHI is not set
-# CONFIG_KL_UARTCLK_PLL is not set
-CONFIG_KL_UARTCLK_INTHI=y
+
+#
+# Kinetis GPIO Interrupt Configuration
+#
+
+#
+# Kinetis UART Configuration
+#
+# CONFIG_KL_UARTFIFOS is not set
 
 #
 # External Memory Configuration
@@ -191,10 +168,12 @@ CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set
+# CONFIG_ARCH_HAVE_RAMVECTORS is not set
 
 #
 # Board Settings
 #
+CONFIG_BOARD_LOOPSPERMSEC=2988
 # CONFIG_ARCH_CALIBRATION is not set
 CONFIG_DRAM_START=0x1FFFF000
 CONFIG_DRAM_SIZE=16384
@@ -236,9 +215,7 @@ CONFIG_MSEC_PER_TICK=10
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
-CONFIG_SCHED_HAVE_PARENT=y
-CONFIG_SCHED_CHILD_STATUS=y
-CONFIG_PREALLOC_CHILDSTATUS=0
+# CONFIG_SCHED_HAVE_PARENT is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2013
 CONFIG_START_MONTH=2
@@ -249,7 +226,6 @@ CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WORKQUEUE is not set
 CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
@@ -257,10 +233,10 @@ CONFIG_SCHED_WAITPID=y
 CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
 # CONFIG_DISABLE_CLOCK is not set
-# CONFIG_DISABLE_POSIX_TIMERS is not set
+CONFIG_DISABLE_POSIX_TIMERS=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
+CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_ENVIRON=y
 
 #
@@ -276,15 +252,15 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 #
 CONFIG_MAX_TASKS=8
 CONFIG_MAX_TASK_ARGS=4
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
+CONFIG_NPTHREAD_KEYS=0
+CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_STREAMS=6
 CONFIG_NAME_MAX=32
-CONFIG_PREALLOC_MQ_MSGS=4
-CONFIG_MQ_MAXMSGSIZE=32
+CONFIG_PREALLOC_MQ_MSGS=0
+CONFIG_MQ_MAXMSGSIZE=0
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_PREALLOC_WDOGS=4
-CONFIG_PREALLOC_TIMERS=4
+CONFIG_PREALLOC_TIMERS=0
 
 #
 # Stack and heap information
@@ -320,10 +296,11 @@ CONFIG_DEV_NULL=y
 # CONFIG_SENSORS is not set
 # CONFIG_SERCOMM_CONSOLE is not set
 CONFIG_SERIAL=y
-CONFIG_DEV_LOWCONSOLE=y
+# CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
 CONFIG_ARCH_HAVE_UART0=y
 CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
 CONFIG_UART0_SERIAL_CONSOLE=y
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
@@ -378,6 +355,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 #
 # Memory Management
 #
+# CONFIG_MM_MULTIHEAP is not set
 CONFIG_MM_SMALL=y
 CONFIG_MM_REGIONS=1
 # CONFIG_GRAN is not set
@@ -385,10 +363,7 @@ CONFIG_MM_REGIONS=1
 #
 # Binary Formats
 #
-# CONFIG_BINFMT_DISABLE is not set
-# CONFIG_NXFLAT is not set
-# CONFIG_ELF is not set
-# CONFIG_BUILTIN is not set
+CONFIG_BINFMT_DISABLE=y
 # CONFIG_PIC is not set
 # CONFIG_SYMTAB_ORDEREDBYNAME is not set
 
@@ -401,7 +376,7 @@ CONFIG_MM_REGIONS=1
 #
 CONFIG_STDIO_BUFFER_SIZE=0
 CONFIG_STDIO_LINEBUFFER=y
-CONFIG_NUNGET_CHARS=2
+CONFIG_NUNGET_CHARS=0
 # CONFIG_LIBM is not set
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
@@ -409,7 +384,6 @@ CONFIG_NUNGET_CHARS=2
 # CONFIG_EOL_IS_LF is not set
 # CONFIG_EOL_IS_BOTH_CRLF is not set
 CONFIG_EOL_IS_EITHER_CRLF=y
-# CONFIG_LIBC_EXECFUNCS is not set
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
 # CONFIG_LIBC_STRERROR is not set
@@ -420,8 +394,9 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
 
 #
-# Non-standard Helper Functions
+# Non-standard Library Support
 #
+# CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_LIB_KBDCODEC is not set
 
 #
@@ -490,6 +465,11 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
 #
+# Graphics Support
+#
+# CONFIG_TIFF is not set
+
+#
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
@@ -605,6 +585,11 @@ CONFIG_NSH_CONSOLE=y
 # CONFIG_SYSTEM_INSTALL is not set
 
 #
+# RAM Test
+#
+# CONFIG_SYSTEM_RAMTEST is not set
+
+#
 # readline()
 #
 CONFIG_SYSTEM_READLINE=y
@@ -633,19 +618,3 @@ CONFIG_READLINE_ECHO=y
 #
 # USB Monitor
 #
-
-# Application configuration
-
-
-# Application configuration
-
-
-# Application configuration
-
-
-# Application configuration
-
-
-# Application configuration
-
-CONFIG_APPS_DIR="../apps"
diff --git a/nuttx/configs/freedom-kl25z/ostest/defconfig b/nuttx/configs/freedom-kl25z/ostest/defconfig
index 61e10e3ec..10a18b7b2 100644
--- a/nuttx/configs/freedom-kl25z/ostest/defconfig
+++ b/nuttx/configs/freedom-kl25z/ostest/defconfig
@@ -39,7 +39,24 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 CONFIG_DEBUG=y
+# CONFIG_DEBUG_VERBOSE is not set
+
+#
+# Subsystem Debug Options
+#
+# CONFIG_DEBUG_MM is not set
 CONFIG_DEBUG_SCHED=y
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_LIB is not set
+# CONFIG_DEBUG_BINFMT is not set
+# CONFIG_DEBUG_GRAPHICS is not set
+
+#
+# Driver Debug Options
+#
+# CONFIG_DEBUG_LEDS is not set
+# CONFIG_DEBUG_ANALOG is not set
+# CONFIG_DEBUG_GPIO is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
@@ -66,13 +83,14 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_IMX is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
+CONFIG_ARCH_CHIP_KL=y
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
 # CONFIG_ARCH_CHIP_LPC31XX is not set
 # CONFIG_ARCH_CHIP_LPC43XX is not set
-CONFIG_ARCH_CHIP_KL=y
+# CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAM3U is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
@@ -82,93 +100,74 @@ CONFIG_ARCH_CHIP="kl"
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARCH_HAVE_MPU is not set
-CONFIG_BOARD_LOOPSPERMSEC=2988
-# CONFIG_ARCH_CALIBRATION is not set
 
 #
 # ARMV6M Configuration Options
 #
-# CONFIG_ARMV6M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV6M_TOOLCHAIN_BUILDROOT is not set
-# CONFIG_ARMV6M_TOOLCHAIN_CODEREDW is not set
-# CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYW is not set
-# CONFIG_ARMV6M_TOOLCHAIN_DEVKITARM is not set
+# CONFIG_ARMV6M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV6M_TOOLCHAIN_CODESOURCERYL is not set
 CONFIG_ARMV6M_TOOLCHAIN_GNU_EABI=y
+# CONFIG_GPIO_IRQ is not set
 
 #
-# KL25Z128/120 Configuration Options
-#
-# CONFIG_ARCH_CHIP_KL25Z128LC1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD2BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RC1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RD1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RD2BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LE3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RD3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RE3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VD2AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VD3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VE3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LC1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD2BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RC1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RD1BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RD2BN is not set
-# CONFIG_ARCH_CHIP_KL25Z128LD3AN is not set
+# Kinetis Configuration Options
+#
 CONFIG_ARCH_CHIP_MKL25Z128=y
-# CONFIG_ARCH_CHIP_KL25Z128RD3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128RE3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VD2AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VD3AN is not set
-# CONFIG_ARCH_CHIP_KL25Z128VE3AN is not set
-CONFIG_ARCH_FAMILY_L20=y
+CONFIG_ARCH_FAMILY_KL2X=y
 
 #
-# KL25Z Peripheral Support
+# Kinetis Peripheral Support
 #
-# CONFIG_KL_PDMA is not set
-# CONFIG_KL_FMC is not set
-# CONFIG_KL_EBI is not set
-# CONFIG_KL_WDT is not set
-# CONFIG_KL_RTC is not set
-# CONFIG_KL_TMR0 is not set
-# CONFIG_KL_TMR1 is not set
-# CONFIG_KL_TIMR2 is not set
-# CONFIG_KL_TIMR3 is not set
-# CONFIG_KL_I2C0 is not set
-# CONFIG_KL_I2C1 is not set
+# CONFIG_KL_TRACE is not set
+# CONFIG_KL_FLEXBUS is not set
+CONFIG_KL_UART0=y
+# CONFIG_KL_UART1 is not set
+# CONFIG_KL_UART2 is not set
+# CONFIG_KL_UART3 is not set
+# CONFIG_KL_UART4 is not set
+# CONFIG_KL_UART5 is not set
+# CONFIG_KL_FLEXCAN0 is not set
+# CONFIG_KL_FLEXCAN1 is not set
 # CONFIG_KL_SPI0 is not set
 # CONFIG_KL_SPI1 is not set
 # CONFIG_KL_SPI2 is not set
-# CONFIG_KL_SPI3 is not set
-# CONFIG_KL_PWM0 is not set
-# CONFIG_KL_PWM1 is not set
-# CONFIG_KL_PWM2 is not set
-# CONFIG_KL_PWM3 is not set
-# CONFIG_KL_PWM4 is not set
-# CONFIG_KL_PWM5 is not set
-# CONFIG_KL_PWM6 is not set
-# CONFIG_KL_PWM7 is not set
-CONFIG_KL_UART0=y
-# CONFIG_KL_UART1 is not set
-# CONFIG_KL_USBD is not set
-# CONFIG_KL_ACMP is not set
-# CONFIG_KL_ADC is not set
-# CONFIG_KL_PS2 is not set
+# CONFIG_KL_I2C0 is not set
+# CONFIG_KL_I2C1 is not set
 # CONFIG_KL_I2S is not set
-CONFIG_KL_INTHI=y
+# CONFIG_KL_DAC0 is not set
+# CONFIG_KL_DAC1 is not set
+# CONFIG_KL_ADC0 is not set
+# CONFIG_KL_ADC1 is not set
+# CONFIG_KL_CMP is not set
+# CONFIG_KL_VREF is not set
+# CONFIG_KL_SDHC is not set
+# CONFIG_KL_FTM0 is not set
+# CONFIG_KL_FTM1 is not set
+# CONFIG_KL_FTM2 is not set
+# CONFIG_KL_LPTIMER is not set
+# CONFIG_KL_RTC is not set
+# CONFIG_KL_EWM is not set
+# CONFIG_KL_CMT is not set
+# CONFIG_KL_USBOTG is not set
+# CONFIG_KL_USBDCD is not set
+# CONFIG_KL_LLWU is not set
+# CONFIG_KL_TSI is not set
+# CONFIG_KL_FTFL is not set
+# CONFIG_KL_DMA is not set
+# CONFIG_KL_CRC is not set
+# CONFIG_KL_PDB is not set
+# CONFIG_KL_PIT is not set
 CONFIG_KL_SYSTICK_CORECLK=y
-# CONFIG_KL_SYSTICK_XTALHI is not set
-# CONFIG_KL_SYSTICK_XTALLO is not set
-# CONFIG_KL_SYSTICK_XTALHId2 is not set
-# CONFIG_KL_SYSTICK_HCLKd2 is not set
-# CONFIG_KL_SYSTICK_INTHId2 is not set
-# CONFIG_KL_UARTCLK_XTALHI is not set
-# CONFIG_KL_UARTCLK_PLL is not set
-CONFIG_KL_UARTCLK_INTHI=y
+
+#
+# Kinetis GPIO Interrupt Configuration
+#
+
+#
+# Kinetis UART Configuration
+#
+# CONFIG_KL_UARTFIFOS is not set
 
 #
 # External Memory Configuration
@@ -187,10 +186,12 @@ CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set
+# CONFIG_ARCH_HAVE_RAMVECTORS is not set
 
 #
 # Board Settings
 #
+CONFIG_BOARD_LOOPSPERMSEC=2988
 # CONFIG_ARCH_CALIBRATION is not set
 CONFIG_DRAM_START=0x1FFFF000
 CONFIG_DRAM_SIZE=16384
@@ -234,6 +235,7 @@ CONFIG_TASK_NAME_SIZE=0
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_CHILD_STATUS=y
 CONFIG_PREALLOC_CHILDSTATUS=0
+# CONFIG_DEBUG_CHILDSTATUS is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2013
 CONFIG_START_MONTH=2
@@ -244,7 +246,6 @@ CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WORKQUEUE is not set
 CONFIG_SCHED_WAITPID=y
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
@@ -264,6 +265,7 @@ CONFIG_DISABLE_ENVIRON=y
 CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCHLD=4
 CONFIG_SIG_SIGCONDTIMEDOUT=16
 
 #
@@ -373,6 +375,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 #
 # Memory Management
 #
+# CONFIG_MM_MULTIHEAP is not set
 CONFIG_MM_SMALL=y
 CONFIG_MM_REGIONS=1
 # CONFIG_GRAN is not set
@@ -415,8 +418,9 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
 
 #
-# Non-standard Helper Functions
+# Non-standard Library Support
 #
+# CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_LIB_KBDCODEC is not set
 
 #
@@ -491,6 +495,11 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=1
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
 #
+# Graphics Support
+#
+# CONFIG_TIFF is not set
+
+#
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
@@ -518,7 +527,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=1
 # CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
-# FreeModbus
+# FreeModBus
 #
 # CONFIG_MODBUS is not set
 
@@ -550,6 +559,11 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=1
 # CONFIG_SYSTEM_INSTALL is not set
 
 #
+# RAM Test
+#
+# CONFIG_SYSTEM_RAMTEST is not set
+
+#
 # readline()
 #
 # CONFIG_SYSTEM_READLINE is not set
diff --git a/nuttx/configs/freedom-kl25z/scripts/ld.script_old b/nuttx/configs/freedom-kl25z/scripts/ld.script_old
deleted file mode 100644
index 9cb70bd3e..000000000
--- a/nuttx/configs/freedom-kl25z/scripts/ld.script_old
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
- * configs/freedom-kl25z/scripts/ld.script
- *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/* The MKL25Z128 has 128Kb of FLASH beginning at address 0x0000:0000 and
- * 16Kb of SRAM at address 0x20000000. 
- */
-
-MEMORY
-{
-    flash (rx) : ORIGIN = 0x00000000, LENGTH = 128K
-    sram (rwx) : ORIGIN = 0x1FFFF000, LENGTH = 16K
-}
-
-OUTPUT_ARCH(arm)
-EXTERN(_vectors)
-ENTRY(_stext)
-
-SECTIONS
-{
-	.text : {
-		_stext = ABSOLUTE(.);
-		*(.vectors)
-		*(.text .text.*)
-		*(.fixup)
-		*(.gnu.warning)
-		*(.rodata .rodata.*)
-		*(.gnu.linkonce.t.*)
-		*(.glue_7)
-		*(.glue_7t)
-		*(.got)
-		*(.gcc_except_table)
-		*(.gnu.linkonce.r.*)
-		_etext = ABSOLUTE(.);
-	} > flash
-
-	.init_section : {
-		_sinit = ABSOLUTE(.);
-		*(.init_array .init_array.*)
-		_einit = ABSOLUTE(.);
-	} > flash
-
-	.ARM.extab : {
-		*(.ARM.extab*)
-	} > flash
-
-	__exidx_start = ABSOLUTE(.);
-	.ARM.exidx : {
-		*(.ARM.exidx*)
-	} > flash
-	__exidx_end = ABSOLUTE(.);
-
-	_eronly = ABSOLUTE(.);
-
-	.data : {
-		_sdata = ABSOLUTE(.);
-		*(.data .data.*)
-		*(.gnu.linkonce.d.*)
-		CONSTRUCTORS
-		_edata = ABSOLUTE(.);
-	} > sram AT > flash
-
-	.bss : {
-		_sbss = ABSOLUTE(.);
-		*(.bss .bss.*)
-		*(.gnu.linkonce.b.*)
-		*(COMMON)
-		_ebss = ABSOLUTE(.);
-	} > sram
-
-	/* Stabs debugging sections. */
-	.stab 0 : { *(.stab) }
-	.stabstr 0 : { *(.stabstr) }
-	.stab.excl 0 : { *(.stab.excl) }
-	.stab.exclstr 0 : { *(.stab.exclstr) }
-	.stab.index 0 : { *(.stab.index) }
-	.stab.indexstr 0 : { *(.stab.indexstr) }
-	.comment 0 : { *(.comment) }
-	.debug_abbrev 0 : { *(.debug_abbrev) }
-	.debug_info 0 : { *(.debug_info) }
-	.debug_line 0 : { *(.debug_line) }
-	.debug_pubnames 0 : { *(.debug_pubnames) }
-	.debug_aranges 0 : { *(.debug_aranges) }
-}