The basic Kinetis K60 port works

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3892 7fd9a85b-ad96-42d3-883c-3090e2eb8679

4 files changed, 96 insertions, 58 deletions

diff --git a/nuttx/configs/twr-k60n512/README.txt b/nuttx/configs/twr-k60n512/README.txt
index c7b3ead474..a6fc5ec2d2 100644
--- a/nuttx/configs/twr-k60n512/README.txt
+++ b/nuttx/configs/twr-k60n512/README.txt
@@ -18,6 +18,7 @@ Contents
     - Connections via the General Purpose Tower Plug-in (TWRPI) Socket
     - Connections via the Tower Primary Connector Side A
     - Connections via the Tower Primary Connector Side B
+    - TWR-SER Serial Board Connection
   o LEDs
   o Development Environment
   o GNU Toolchain Options
@@ -69,24 +70,24 @@ LEDs                 E1 / Orange LED           PTA11    PTA11
                      E2 / Yellow LED           PTA28    PTA28
                      E3 / Green LED            PTA29    PTA29
                      E4 / Blue LED             PTA10    PTA10
-Potentiometer        Potentiometer (R71)        ?        ADC1_DM1
-Accelerometer        I2C SDA                    PTD9     I2C0_SDA
-                     I2C SCL                    PTD8     I2C0_SCL
-                     IRQ                        PTD10    PTD10
-Touch Pad / Segment  Electrode 0 (J3 Pin 3)     PTB0     TSI0_CH0
-LCD TWRPI Socket     Electrode 1 (J3 Pin 5)     PTB1     TSI0_CH6
-                     Electrode 2 (J3 Pin 7)     PTB2     TSI0_CH7
-                     Electrode 3 (J3 Pin 8)     PTB3     TSI0_CH8
-                     Electrode 4 (J3 Pin 9)     PTC0     TSI0_CH13
-                     Electrode 5 (J3 Pin 10)    PTC1     TSI0_CH14
-                     Electrode 6 (J3 Pin 11)    PTC2     TSI0_CH15
-                     Electrode 7 (J3 Pin 12)    PTA4     TSI0_CH5
-                     Electrode 8 (J3 Pin 13)    PTB16    TSI0_CH9
-                     Electrode 9 (J3 Pin 14)    PTB17    TSI0_CH10
-                     Electrode 10 (J3 Pin 15)   PTB18    TSI0_CH11
-                     Electrode 11 (J3 Pin 16)   PTB19    TSI0_CH12
-                     TWRPI ID0 (J3 Pin 17)      ?        ADC1_DP1
-                     TWRPI ID1 (J3 Pin 18)      ?        ADC1_SE16
+Potentiometer        Potentiometer (R71)       ?        ADC1_DM1
+Accelerometer        I2C SDA                   PTD9     I2C0_SDA
+                     I2C SCL                   PTD8     I2C0_SCL
+                     IRQ                       PTD10    PTD10
+Touch Pad / Segment  Electrode 0 (J3 Pin 3)    PTB0     TSI0_CH0
+LCD TWRPI Socket     Electrode 1 (J3 Pin 5)    PTB1     TSI0_CH6
+                     Electrode 2 (J3 Pin 7)    PTB2     TSI0_CH7
+                     Electrode 3 (J3 Pin 8)    PTB3     TSI0_CH8
+                     Electrode 4 (J3 Pin 9)    PTC0     TSI0_CH13
+                     Electrode 5 (J3 Pin 10)   PTC1     TSI0_CH14
+                     Electrode 6 (J3 Pin 11)   PTC2     TSI0_CH15
+                     Electrode 7 (J3 Pin 12)   PTA4     TSI0_CH5
+                     Electrode 8 (J3 Pin 13)   PTB16    TSI0_CH9
+                     Electrode 9 (J3 Pin 14)   PTB17    TSI0_CH10
+                     Electrode 10 (J3 Pin 15)  PTB18    TSI0_CH11
+                     Electrode 11 (J3 Pin 16)  PTB19    TSI0_CH12
+                     TWRPI ID0 (J3 Pin 17)     ?        ADC1_DP1
+                     TWRPI ID1 (J3 Pin 18)     ?        ADC1_SE16
 
 Connections via the General Purpose Tower Plug-in (TWRPI) Socket
 -------------------- ------------------------- -------- -------------------
@@ -229,6 +230,33 @@ B78 EBI_D2               PTC13
 B79 EBI_D1               PTC14
 B80 EBI_D0               PTC15
 
+TWR-SER Serial Board Connection
+===============================
+
+The serial board connects into the tower and then maps to the tower pins to
+yet other functions (see TWR-SER.pdf).
+
+For the serial port, the following jumpers are required:
+
+  J15: 1-2 (default)
+  J17: 1-2 (default)
+  J18: 1-2 (default)
+  J19: 1-2 (default)
+
+The two connections map as follows:
+
+  A41 RXD0  - Not connected
+  A42 TXD0  - Not connected
+  A43 RXD1  - ELE_RXD (connects indirectory to DB-9 connector J8)
+  A44 TXD1  - ELE_TXD (connects indirectory to DB-9 connector J8)
+
+Finally, we can conclude that:
+
+  UART4 (PTE24/25) is not connected, and
+  UART3 (PTC16/17) is associated with the DB9 connector
+
+NOTE: UART5 is associated with OSJTAG bridge and may also be usable.
+
 LEDs
 ====
 
diff --git a/nuttx/configs/twr-k60n512/include/board.h b/nuttx/configs/twr-k60n512/include/board.h
index f44fe77c6c..9de17ef7a0 100755
--- a/nuttx/configs/twr-k60n512/include/board.h
+++ b/nuttx/configs/twr-k60n512/include/board.h
@@ -153,24 +153,24 @@
  *                      E2 / Yellow LED           PTA28    PTA28
  *                      E3 / Green LED            PTA29    PTA29
  *                      E4 / Blue LED             PTA10    PTA10
- * Potentiometer        Potentiometer (R71)        ?        ADC1_DM1
- * Accelerometer        I2C SDA                    PTD9     I2C0_SDA
- *                      I2C SCL                    PTD8     I2C0_SCL
- *                      IRQ                        PTD10    PTD10
- * Touch Pad / Segment  Electrode 0 (J3 Pin 3)     PTB0     TSI0_CH0
- * LCD TWRPI Socket     Electrode 1 (J3 Pin 5)     PTB1     TSI0_CH6
- *                      Electrode 2 (J3 Pin 7)     PTB2     TSI0_CH7
- *                      Electrode 3 (J3 Pin 8)     PTB3     TSI0_CH8
- *                      Electrode 4 (J3 Pin 9)     PTC0     TSI0_CH13
- *                      Electrode 5 (J3 Pin 10)    PTC1     TSI0_CH14
- *                      Electrode 6 (J3 Pin 11)    PTC2     TSI0_CH15
- *                      Electrode 7 (J3 Pin 12)    PTA4     TSI0_CH5
- *                      Electrode 8 (J3 Pin 13)    PTB16    TSI0_CH9
- *                      Electrode 9 (J3 Pin 14)    PTB17    TSI0_CH10
- *                      Electrode 10 (J3 Pin 15)   PTB18    TSI0_CH11
- *                      Electrode 11 (J3 Pin 16)   PTB19    TSI0_CH12
- *                      TWRPI ID0 (J3 Pin 17)      ?        ADC1_DP1
- *                      TWRPI ID1 (J3 Pin 18)      ?        ADC1_SE16
+ * Potentiometer        Potentiometer (R71)       ?        ADC1_DM1
+ * Accelerometer        I2C SDA                   PTD9     I2C0_SDA
+ *                      I2C SCL                   PTD8     I2C0_SCL
+ *                      IRQ                       PTD10    PTD10
+ * Touch Pad / Segment  Electrode 0 (J3 Pin 3)    PTB0     TSI0_CH0
+ * LCD TWRPI Socket     Electrode 1 (J3 Pin 5)    PTB1     TSI0_CH6
+ *                      Electrode 2 (J3 Pin 7)    PTB2     TSI0_CH7
+ *                      Electrode 3 (J3 Pin 8)    PTB3     TSI0_CH8
+ *                      Electrode 4 (J3 Pin 9)    PTC0     TSI0_CH13
+ *                      Electrode 5 (J3 Pin 10)   PTC1     TSI0_CH14
+ *                      Electrode 6 (J3 Pin 11)   PTC2     TSI0_CH15
+ *                      Electrode 7 (J3 Pin 12)   PTA4     TSI0_CH5
+ *                      Electrode 8 (J3 Pin 13)   PTB16    TSI0_CH9
+ *                      Electrode 9 (J3 Pin 14)   PTB17    TSI0_CH10
+ *                      Electrode 10 (J3 Pin 15)  PTB18    TSI0_CH11
+ *                      Electrode 11 (J3 Pin 16)  PTB19    TSI0_CH12
+ *                      TWRPI ID0 (J3 Pin 17)     ?        ADC1_DP1
+ *                      TWRPI ID1 (J3 Pin 18)     ?        ADC1_SE16
  */
 
 #define PIN_UART5_RX  PIN_UART5_RX_2
@@ -257,6 +257,16 @@
  * A80 EBI_AD0              PTD6
  */
 
+/* PTE 26/27 */
+
+#define PIN_UART3_RX   PIN_UART3_RX_2
+#define PIN_UART3_TX   PIN_UART3_TX_2
+
+/* PTE 24/25 */
+
+#define PIN_UART4_RX   PIN_UART4_RX_2
+#define PIN_UART4_TX   PIN_UART4_TX_2
+
 /* Connections via the Tower Primary Connector Side B
  * --- -------------------- --------------------------------
  * PIN NAME                 USAGE
diff --git a/nuttx/configs/twr-k60n512/ostest/defconfig b/nuttx/configs/twr-k60n512/ostest/defconfig
index 9770e91ca7..0a758f050a 100755
--- a/nuttx/configs/twr-k60n512/ostest/defconfig
+++ b/nuttx/configs/twr-k60n512/ostest/defconfig
@@ -152,9 +152,9 @@ CONFIG_KINETIS_FLEXBUS=n
 CONFIG_KINETIS_UART0=n
 CONFIG_KINETIS_UART1=n
 CONFIG_KINETIS_UART2=n
-CONFIG_KINETIS_UART3=n
+CONFIG_KINETIS_UART3=y
 CONFIG_KINETIS_UART4=n
-CONFIG_KINETIS_UART5=y
+CONFIG_KINETIS_UART5=n
 CONFIG_KINETIS_ENET=n
 CONFIG_KINETIS_RNGB=n
 CONFIG_KINETIS_FLEXCAN0=n
@@ -225,9 +225,9 @@ CONFIG_KINETIS_PORTEINTS=n
 CONFIG_UART0_SERIAL_CONSOLE=n
 CONFIG_UART1_SERIAL_CONSOLE=n
 CONFIG_UART2_SERIAL_CONSOLE=n
-CONFIG_UART3_SERIAL_CONSOLE=n
+CONFIG_UART3_SERIAL_CONSOLE=y
 CONFIG_UART4_SERIAL_CONSOLE=n
-CONFIG_UART5_SERIAL_CONSOLE=y
+CONFIG_UART5_SERIAL_CONSOLE=n
 
 CONFIG_UART0_TXBUFSIZE=256
 CONFIG_UART1_TXBUFSIZE=256
diff --git a/nuttx/configs/twr-k60n512/src/twrk60-internal.h b/nuttx/configs/twr-k60n512/src/twrk60-internal.h
index 72c005d702..bbec8955a0 100755
--- a/nuttx/configs/twr-k60n512/src/twrk60-internal.h
+++ b/nuttx/configs/twr-k60n512/src/twrk60-internal.h
@@ -89,24 +89,24 @@
  *                      E2 / Yellow LED           PTA28    PTA28
  *                      E3 / Green LED            PTA29    PTA29
  *                      E4 / Blue LED             PTA10    PTA10
- * Potentiometer        Potentiometer (R71)        ?        ADC1_DM1
- * Accelerometer        I2C SDA                    PTD9     I2C0_SDA
- *                      I2C SCL                    PTD8     I2C0_SCL
- *                      IRQ                        PTD10    PTD10
- * Touch Pad / Segment  Electrode 0 (J3 Pin 3)     PTB0     TSI0_CH0
- * LCD TWRPI Socket     Electrode 1 (J3 Pin 5)     PTB1     TSI0_CH6
- *                      Electrode 2 (J3 Pin 7)     PTB2     TSI0_CH7
- *                      Electrode 3 (J3 Pin 8)     PTB3     TSI0_CH8
- *                      Electrode 4 (J3 Pin 9)     PTC0     TSI0_CH13
- *                      Electrode 5 (J3 Pin 10)    PTC1     TSI0_CH14
- *                      Electrode 6 (J3 Pin 11)    PTC2     TSI0_CH15
- *                      Electrode 7 (J3 Pin 12)    PTA4     TSI0_CH5
- *                      Electrode 8 (J3 Pin 13)    PTB16    TSI0_CH9
- *                      Electrode 9 (J3 Pin 14)    PTB17    TSI0_CH10
- *                      Electrode 10 (J3 Pin 15)   PTB18    TSI0_CH11
- *                      Electrode 11 (J3 Pin 16)   PTB19    TSI0_CH12
- *                      TWRPI ID0 (J3 Pin 17)      ?        ADC1_DP1
- *                      TWRPI ID1 (J3 Pin 18)      ?        ADC1_SE16
+ * Potentiometer        Potentiometer (R71)       ?        ADC1_DM1
+ * Accelerometer        I2C SDA                   PTD9     I2C0_SDA
+ *                      I2C SCL                   PTD8     I2C0_SCL
+ *                      IRQ                       PTD10    PTD10
+ * Touch Pad / Segment  Electrode 0 (J3 Pin 3)    PTB0     TSI0_CH0
+ * LCD TWRPI Socket     Electrode 1 (J3 Pin 5)    PTB1     TSI0_CH6
+ *                      Electrode 2 (J3 Pin 7)    PTB2     TSI0_CH7
+ *                      Electrode 3 (J3 Pin 8)    PTB3     TSI0_CH8
+ *                      Electrode 4 (J3 Pin 9)    PTC0     TSI0_CH13
+ *                      Electrode 5 (J3 Pin 10)   PTC1     TSI0_CH14
+ *                      Electrode 6 (J3 Pin 11)   PTC2     TSI0_CH15
+ *                      Electrode 7 (J3 Pin 12)   PTA4     TSI0_CH5
+ *                      Electrode 8 (J3 Pin 13)   PTB16    TSI0_CH9
+ *                      Electrode 9 (J3 Pin 14)   PTB17    TSI0_CH10
+ *                      Electrode 10 (J3 Pin 15)  PTB18    TSI0_CH11
+ *                      Electrode 11 (J3 Pin 16)  PTB19    TSI0_CH12
+ *                      TWRPI ID0 (J3 Pin 17)     ?        ADC1_DP1
+ *                      TWRPI ID1 (J3 Pin 18)     ?        ADC1_SE16
  */
  
 #define GPIO_SD_CARDDETECT (GPIO_PULLUP | PIN_INT_BOTH | PIN_PORTE | PIN28)