configs/freedom-kl25z: Change references to NuTiny to Freedom KL25Z

4 files changed, 116 insertions, 73 deletions

diff --git a/nuttx/configs/freedom-kl25z/README.txt b/nuttx/configs/freedom-kl25z/README.txt
index 617d416d2..00bb4640b 100644
--- a/nuttx/configs/freedom-kl25z/README.txt
+++ b/nuttx/configs/freedom-kl25z/README.txt
@@ -1,9 +1,8 @@
 README.txt
 ==========
 
-This is the README file for the port of NuttX to the Freescale
-Freedom KL25Z board.  This board has the K25Z120LE3AN chip
-with a built-in SDA debugger.
+This is the README file for the port of NuttX to the Freescale Freedom KL25Z
+board.  This board has the MKL25Z128 chip with a built-in SDA debugger.
 
 Contents
 ========
@@ -14,13 +13,13 @@ Contents
   - LEDs
   - Serial Console
   - mbed
-  - NuTiny-specific Configuration Options
+  - Freedom KL25Z-specific Configuration Options
   - Configurations
 
 Development Environment
 =======================
 
-  Either Linux or Cygwin on Windows can be used for the development environment.
+  Either Linux or Cygwin under Windows can be used for the development environment.
   The source has been built only using the GNU toolchain (see below).  Other
   toolchains will likely cause problems.
 
@@ -36,7 +35,7 @@ NuttX Buildroot Toolchain
 =========================
 
   A GNU GCC-based toolchain is assumed.  The files */setenv.sh should
-  be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
+  be modified to point to the correct path to the Cortex-M0 GCC toolchain (if
   different from the default in your PATH variable).
 
   If you have no Cortex-M0 toolchain, one can be downloaded from the NuttX
@@ -67,29 +66,36 @@ NuttX Buildroot Toolchain
 
   See the file configs/README.txt in the buildroot source tree.  That has more
   details PLUS some special instructions that you will need to follow if you are
-  building a Cortex-M3 toolchain for Cygwin under Windows.
+  building a Cortex-M0 toolchain for Cygwin under Windows.
 
 LEDs
 ====
 
-  The NuTiny has a single green LED that can be controlled from sofware.
-  This LED is connected to PIN17.  It is pulled high so a low value will
-  illuminate the LED.
+  The Freedom KL25Z has a single RGB LED driven by the KL25Z as follows:
+
+    ------------- --------
+    RGB LED       KL25Z128
+    ------------- --------
+    Red Cathode   PTB18
+    Green Cathode PTB19
+    Blue Cathode  PTD1
+
+   NOTE: PTD1 is also connected to the I/O header on J2 pin 10 (also known as D13).
 
   If CONFIG_ARCH_LEDs is defined, then NuttX will control the LED on board the
-  NuTiny.  The following definitions describe how NuttX controls the LEDs:
+  Freedom KL25Z.  The following definitions describe how NuttX controls the LEDs:
 
     SYMBOL                Meaning                 LED state
                                                   Initially all LED is OFF
-    -------------------  -----------------------  ------------- ------------
-    LED_STARTED          NuttX has been started   LED ON
-    LED_HEAPALLOCATE     Heap has been allocated  LED ON
-    LED_IRQSENABLED      Interrupts enabled       LED ON
-    LED_STACKCREATED     Idle stack created       LED ON
-    LED_INIRQ            In an interrupt          LED should glow
-    LED_SIGNAL           In a signal handler      LED might glow
-    LED_ASSERTION        An assertion failed      LED ON while handling the assertion
-    LED_PANIC            The system has crashed   LED Blinking at 2Hz
+    -------------------  -----------------------  --------------------------
+    LED_STARTED          NuttX has been started   
+    LED_HEAPALLOCATE     Heap has been allocated  
+    LED_IRQSENABLED      Interrupts enabled       
+    LED_STACKCREATED     Idle stack created       
+    LED_INIRQ            In an interrupt          
+    LED_SIGNAL           In a signal handler      
+    LED_ASSERTION        An assertion failed      
+    LED_PANIC            The system has crashed   
     LED_IDLE             K25Z1XX is in sleep mode  (Optional, not used)
 
 Serial Console
@@ -127,8 +133,8 @@ to the SDA bootloader is this boot loader from mbed:
 http://mbed.org/handbook/mbed-FRDM-KL25Z-Getting-Started
 http://mbed.org/handbook/Firmware-FRDM-KL25Z
 
-NuTiny-specific Configuration Options
-=====================================
+Freedom KL25Z-specific Configuration Options
+============================================
 
     CONFIG_ARCH - Identifies the arch/ subdirectory.  This should
        be set to:
@@ -150,7 +156,7 @@ NuTiny-specific Configuration Options
     CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
        chip:
 
-       CONFIG_ARCH_CHIP_K25Z120LE3AN=y
+       CONFIG_ARCH_CHIP_MKL25Z128=y
 
     CONFIG_ARCH_BOARD - Identifies the configs subdirectory and
        hence, the board that supports the particular chip or SoC.
@@ -199,7 +205,7 @@ NuTiny-specific Configuration Options
        the delay actually is 100 seconds.
 
   Individual subsystems can be enabled as follows.  These settings are for
-  all of the K25Z100/120 line and may not be available for the K25Z120LE3AN
+  all of the K25Z100/120 line and may not be available for the MKL25Z128
   in particular:
 
   AHB
@@ -283,7 +289,7 @@ Where <subdir> is one of the following:
     apps/examples/ostest.
 
     NOTES:
- 
+
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
@@ -313,7 +319,7 @@ Where <subdir> is one of the following:
     builtin applications is disabled.
 
     NOTES:
- 
+
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
diff --git a/nuttx/configs/freedom-kl25z/include/board.h b/nuttx/configs/freedom-kl25z/include/board.h
index 185160c0a..11d375e05 100644
--- a/nuttx/configs/freedom-kl25z/include/board.h
+++ b/nuttx/configs/freedom-kl25z/include/board.h
@@ -134,7 +134,33 @@
 #endif
 
 /* LED definitions ******************************************************************/
-/* The KwikStik-K40 board has no MCU driven, GPIO-based LEDs */
+/* The Freedom KL25Z has a single RGB LED driven by the KL25Z as follows:
+ *
+ *   ------------- --------
+ *   RGB LED       KL25Z128
+ *   ------------- --------
+ *   Red Cathode   PTB18
+ *   Green Cathode PTB19
+ *   Blue Cathode  PTD1
+ *
+ * NOTE: PTD1 is also connected to the I/O header on J2 pin 10 (also known as D13).
+ *
+ * If CONFIG_ARCH_LEDs is defined, then NuttX will control the LED on board the
+ * Freedom KL25Z.  The following definitions describe how NuttX controls the LEDs:
+ *
+ *   SYMBOL                Meaning                 LED state
+ *                                                 Initially all LED is OFF
+ *   -------------------  -----------------------  --------------------------
+ *   LED_STARTED          NuttX has been started   
+ *   LED_HEAPALLOCATE     Heap has been allocated  
+ *   LED_IRQSENABLED      Interrupts enabled       
+ *   LED_STACKCREATED     Idle stack created       
+ *   LED_INIRQ            In an interrupt          
+ *   LED_SIGNAL           In a signal handler      
+ *   LED_ASSERTION        An assertion failed      
+ *   LED_PANIC            The system has crashed   
+ *   LED_IDLE             K25Z1XX is in sleep mode  (Optional, not used)
+ */
 
 #define LED_STARTED       0
 #define LED_HEAPALLOCATE  1
@@ -146,7 +172,7 @@
 #define LED_PANIC         7
 
 /* Button definitions ***************************************************************/
-/* The KwikStik-K40 board has no standard GPIO contact buttons */
+/* The Freedom KL25Z board has no standard GPIO contact buttons */
 
 /* Alternative pin resolution *******************************************************/
 /* If there are alternative configurations for various pins in the
diff --git a/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h b/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h
index a3f70578b..b387b5a55 100644
--- a/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h
+++ b/nuttx/configs/freedom-kl25z/src/freedom-kl25z.h
@@ -34,8 +34,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __CONFIGS_NUTINY_NUC120_SRC_NUTINY_NUC120_H
-#define __CONFIGS_NUTINY_NUC120_SRC_NUTINY_NUC120_H
+#ifndef __CONFIGS_FREEDOM_KL25Z_SRC_FREEDOM_KL25Z_H
+#define __CONFIGS_FREEDOM_KL25Z_SRC_FREEDOM_KL25Z_H
 
 /****************************************************************************************************
  * Included Files
@@ -50,31 +50,41 @@
  ****************************************************************************************************/
 /* Configuration ************************************************************************************/
 
-/* NuTiny-EVB-120 GPIOs *****************************************************************************/
-/* The NuTiny has a single green LED that can be controlled from sofware.  This LED
- * is connected to PIN17 (PB.0).  It is pulled high so a low value will illuminate the LED.
+/* Freedom KL25Z GPIOs ******************************************************************************/
+/* The Freedom KL25Z has a single RGB LED driven by the KL25Z as follows:
+ *
+ *   ------------- --------
+ *   RGB LED       KL25Z128
+ *   ------------- --------
+ *   Red Cathode   PTB18
+ *   Green Cathode PTB19
+ *   Blue Cathode  PTD1
+ *
+ * NOTE: PTD1 is also connected to the I/O header on J2 pin 10 (also known as D13).
  *
  * If CONFIG_ARCH_LEDs is defined, then NuttX will control the LED on board the
- * NuTiny.  The following definitions describe how NuttX controls the LEDs:
+ * Freedom KL25Z.  The following definitions describe how NuttX controls the LEDs:
  *
  *   SYMBOL                Meaning                 LED state
  *                                                 Initially all LED is OFF
- *   -------------------  -----------------------  ------------- ------------
- *   LED_STARTED          NuttX has been started   LED ON
- *   LED_HEAPALLOCATE     Heap has been allocated  LED ON
- *   LED_IRQSENABLED      Interrupts enabled       LED ON
- *   LED_STACKCREATED     Idle stack created       LED ON
- *   LED_INIRQ            In an interrupt          LED should glow
- *   LED_SIGNAL           In a signal handler      LED might glow
- *   LED_ASSERTION        An assertion failed      LED ON while handling the assertion
- *   LED_PANIC            The system has crashed   LED Blinking at 2Hz
- *   LED_IDLE             NUC1XX is in sleep mode   (Optional, not used)
+ *   -------------------  -----------------------  --------------------------
+ *   LED_STARTED          NuttX has been started   
+ *   LED_HEAPALLOCATE     Heap has been allocated  
+ *   LED_IRQSENABLED      Interrupts enabled       
+ *   LED_STACKCREATED     Idle stack created       
+ *   LED_INIRQ            In an interrupt          
+ *   LED_SIGNAL           In a signal handler      
+ *   LED_ASSERTION        An assertion failed      
+ *   LED_PANIC            The system has crashed   
+ *   LED_IDLE             K25Z1XX is in sleep mode  (Optional, not used)
  */
 
-#define GPIO_LED (GPIO_OUTPUT | GPIO_OUTPUT_SET | GPIO_PORTB | GPIO_PIN0)
+#define GPIO_LED_R (GPIO_OUTPUT | GPIO_OUTPUT_SET | GPIO_PORTB | GPIO_PIN18)
+#define GPIO_LED_G (GPIO_OUTPUT | GPIO_OUTPUT_SET | GPIO_PORTB | GPIO_PIN19)
+#define GPIO_LED_B (GPIO_OUTPUT | GPIO_OUTPUT_SET | GPIO_PORTD | GPIO_PIN1)
 
 /* Button definitions ***************************************************************/
-/* The NuTiny has no buttons */
+/* The Freedom KL25Z has no buttons */
 
 /****************************************************************************************************
  * Public Types
@@ -94,7 +104,7 @@
  * Name: kl_spiinitialize
  *
  * Description:
- *   Called to configure SPI chip select GPIO pins for the NuTiny-EVB-120 board.
+ *   Called to configure SPI chip select GPIO pins for the Freedom KL25Z board.
  *
  ****************************************************************************************************/
 
@@ -105,7 +115,7 @@ void weak_function kl_spiinitialize(void);
  *
  * Description:
  *   Called from kl_usbinitialize very early in inialization to setup USB-related
- *   GPIO pins for the NuTiny-EVB-120 board.
+ *   GPIO pins for the Freedom KL25Z board.
  *
  ****************************************************************************************************/
 
@@ -127,5 +137,5 @@ void kl_ledinit(void);
 
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CONFIGS_NUTINY_NUC120_SRC_NUTINY_NUC120_H */
+#endif /* __CONFIGS_FREEDOM_KL25Z_SRC_FREEDOM_KL25Z_H */
 
diff --git a/nuttx/configs/freedom-kl25z/src/kl_led.c b/nuttx/configs/freedom-kl25z/src/kl_led.c
index aa633a080..ccd4b4f58 100644
--- a/nuttx/configs/freedom-kl25z/src/kl_led.c
+++ b/nuttx/configs/freedom-kl25z/src/kl_led.c
@@ -33,25 +33,30 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  ****************************************************************************/
-/* The NuTiny has a single green LED that can be controlled from sofware.
- * This LED is connected to PIN17.  It is pulled high so a low value will
- * illuminate the LED.
+/* The Freedom KL25Z has a single RGB LED driven by the KL25Z as follows:
+ *
+ *   ------------- --------
+ *   RGB LED       KL25Z128
+ *   ------------- --------
+ *   Red Cathode   PTB18
+ *   Green Cathode PTB19
+ *   Blue Cathode  PTD1
  *
  * If CONFIG_ARCH_LEDs is defined, then NuttX will control the LED on board the
- * NuTiny.  The following definitions describe how NuttX controls the LEDs:
+ * Freedom KL25Z.  The following definitions describe how NuttX controls the LEDs:
  *
  *   SYMBOL                Meaning                 LED state
  *                                                 Initially all LED is OFF
- *   -------------------  -----------------------  ------------- ------------
- *   LED_STARTED          NuttX has been started   LED ON
- *   LED_HEAPALLOCATE     Heap has been allocated  LED ON
- *   LED_IRQSENABLED      Interrupts enabled       LED ON
- *   LED_STACKCREATED     Idle stack created       LED ON
- *   LED_INIRQ            In an interrupt          LED should glow
- *   LED_SIGNAL           In a signal handler      LED might glow
- *   LED_ASSERTION        An assertion failed      LED ON while handling the assertion
- *   LED_PANIC            The system has crashed   LED Blinking at 2Hz
- *   LED_IDLE             NUC1XX is is sleep mode   (Optional, not used)
+ *   -------------------  -----------------------  --------------------------
+ *   LED_STARTED          NuttX has been started   
+ *   LED_HEAPALLOCATE     Heap has been allocated  
+ *   LED_IRQSENABLED      Interrupts enabled       
+ *   LED_STACKCREATED     Idle stack created       
+ *   LED_INIRQ            In an interrupt          
+ *   LED_SIGNAL           In a signal handler      
+ *   LED_ASSERTION        An assertion failed      
+ *   LED_PANIC            The system has crashed   
+ *   LED_IDLE             K25Z1XX is in sleep mode  (Optional, not used)
  */
 
 /****************************************************************************
@@ -70,9 +75,6 @@
 #include "kl_gpio.h"
 #include "freedom-kl25z.h"
 
-//extern void blueled(int on);
-//int i=0;
-
 #ifdef CONFIG_ARCH_LEDS
 
 /****************************************************************************
@@ -98,7 +100,7 @@
 /* Dump GPIO registers */
 
 #if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_LEDS)
-#  define led_dumpgpio(m) kl_dumpgpio(GPIO_LED, m)
+#  define led_dumpgpio(m) kl_dumpgpio(GPIO_LED_B, m)
 #else
 #  define led_dumpgpio(m)
 #endif
@@ -126,10 +128,9 @@
 void kl_ledinit(void)
 {
   led_dumpgpio("Before configuration");
-  //kl_configgpio(GPIO_LED);
-  /* Blink blue LED to indicate we are here */
-  //for (; ; i++)
-  //      blueled(i & 0x10000);
+  //kl_configgpio(GPIO_LED_R);
+  //kl_configgpio(GPIO_LED_G);
+  //kl_configgpio(GPIO_LED_B);
   led_dumpgpio("After configuration");
 }
 
@@ -139,7 +140,7 @@ void kl_ledinit(void)
 
 void up_ledon(int led)
 {
-  kl_gpiowrite(GPIO_LED, false);
+  kl_gpiowrite(GPIO_LED_B, false);
 }
 
 /****************************************************************************
@@ -148,7 +149,7 @@ void up_ledon(int led)
 
 void up_ledoff(int led)
 {
-  kl_gpiowrite(GPIO_LED, true);
+  kl_gpiowrite(GPIO_LED_B, true);
 }
 
 #endif /* CONFIG_ARCH_LEDS */