Review/update of the TM4C1294 Launchpad code

19 files changed, 61 insertions, 20 deletions

diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 1fc72a6322..bf63b3d3c4 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -1334,7 +1334,7 @@
       <li><a href="#armcortexa8">ARM Cortex-A8</a> (1)</li>
       <li><a href="#armcortexm0">ARM Cortex-M0/M0+</a> (4)</li>
       <li><a href="#armcortexm3">ARM Cortex-M3</a> (30)</li>
-      <li><a href="#armcortexm4">ARM Cortex-M4</a> (18)</li>
+      <li><a href="#armcortexm4">ARM Cortex-M4</a> (19)</li>
     </ul>
   <li>Atmel AVR
     <ul>
@@ -1505,6 +1505,7 @@
       <li><a href="#tilms9b96">TI/Stellaris LM3S9B96</a> <small>(ARM Cortex-M3)</small></li>
       <li><a href="#tilm4f120x">TI/Stellaris LM4F120x</a> <small>(ARM Cortex-M4)</small></li>
       <li><a href="#titm4c123g">TI/Tiva TM4C123G</a> <small>(ARM Cortex-M4)</small></li>
+      <li><a href="#titm4c1294">TI/Tiva TM4C1294</a> <small>(ARM Cortex-M4)</small></li>
       <li><a href="#titm4c129x">TI/Tiva TM4C129X</a> <small>(ARM Cortex-M4)</small></li>
       <li><a href="#ticc3200launchpad">TI/Tiva CC3200 Launchpad</a> <small>(ARM Cortex-M4)</small></li>
     </ul>
@@ -3552,6 +3553,32 @@ nsh>
   <td><br></td>
   <td>
     <p>
+      <a name="titm4c1294"><b>TI Tiva TM4C1294</b>.</a>
+      This port uses the TI Tiva TM4C1294 LaunchPad.
+    </p>
+    <ul>
+      <p>
+        <b>STATUS:</b>
+        <ul>
+          <li>
+            Support for the TI Tiva TM4C123G Launchpad was contributed by Frank Sautter and was released in NuttX 7.9.
+            This basic board support included a configuration for the NuttShell <a href="http://www.nuttx.org/Documentation/NuttShell.html">NSH</a>) and a configuration for testing IPv6.
+           </li>
+        </ul>
+      </p>
+        Refer to the TM4C1294 LaunchPad board <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/tm4c1294-launchpad/README.txt">README</a> file for more detailed information about this port.
+      </p>
+    </ul>
+  </td>
+</tr>
+<tr>
+  <td><br></td>
+  <td><hr></td>
+</tr>
+<tr>
+  <td><br></td>
+  <td>
+    <p>
       <a name="titm4c129x"><b>TI Tiva TM4C129X</b>.</a>
       This port uses the TI Tiva DK-TM4C129X Connected Development Kit.
     </p>
diff --git a/nuttx/Documentation/README.html b/nuttx/Documentation/README.html
index 37aa984d06..74f12f4f6f 100644
--- a/nuttx/Documentation/README.html
+++ b/nuttx/Documentation/README.html
@@ -236,6 +236,8 @@
  |   |   |   `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/teensy/README.txt"><b><i>README.txt</i></b></a>
  |   |   |- tm4c123g-launchpad/
  |   |   |   `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/tm4c123g-launchpad/README.txt"><b><i>README.txt</i></b></a>
+ |   |   |- tm4c1294-launchpad/
+ |   |   |   `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/tm4c1294-launchpad/README.txt"><b><i>README.txt</i></b></a>
  |   |   |- twr-k60n512/
  |   |   |   `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/twr-k60n512/README.txt"><b><i>README.txt</i></b></a>
  |   |   |- ubw32/
diff --git a/nuttx/README.txt b/nuttx/README.txt
index bd41014f7f..044badb7e1 100644
--- a/nuttx/README.txt
+++ b/nuttx/README.txt
@@ -1295,6 +1295,8 @@ nuttx
  |   |   `- README.txt
  |   |- tm4c123g-launchpad/
  |   |   `- README.txt
+ |   |- tm4c1294-launchpad/
+ |   |   `- README.txt
  |   |- twr-k60n512/
  |   |   `- README.txt
  |   |- ubw32/
diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig
index bee4cc74ef..29c62bc3b2 100644
--- a/nuttx/configs/Kconfig
+++ b/nuttx/configs/Kconfig
@@ -1460,6 +1460,9 @@ endif
 if ARCH_BOARD_TM4C123G_LAUNCHPAD
 source "configs/tm4c123g-launchpad/Kconfig"
 endif
+if ARCH_BOARD_TM4C1294_LAUNCHPAD
+source "configs/tm4c1294-launchpad/Kconfig"
+endif
 if ARCH_BOARD_CC3200_LAUNCHPAD
 source "configs/cc3200-launchpad/Kconfig"
 endif
diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt
index c762060f23..3957688ade 100644
--- a/nuttx/configs/README.txt
+++ b/nuttx/configs/README.txt
@@ -589,6 +589,12 @@ configs/tm4c123g-launchpad
   platform for ARM® Cortex™-M4F-based microcontrollers from Texas
   Instruments.
 
+configs/tm4c1294-launchpad
+  This is the port of NuttX to the Tiva® TM4C1294 LaunchPad.  The
+  Tiva® TM4C123G LaunchPad Evaluation Board is a low-cost evaluation
+  platform for ARM® Cortex™-M4F-based microcontrollers from Texas
+  Instruments.
+
 configs/twr-k60n512
   Kinetis K60 Cortex-M4 MCU.  This port uses the FreeScale TWR-K60N512
   development board.
diff --git a/nuttx/configs/tm4c1294-launchpad/include/board.h b/nuttx/configs/tm4c1294-launchpad/include/board.h
index 2bf6353a74..ee4d8b55dc 100644
--- a/nuttx/configs/tm4c1294-launchpad/include/board.h
+++ b/nuttx/configs/tm4c1294-launchpad/include/board.h
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/tm4c1294-launchpad/include/board.h
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/tm4c1294-launchpad/ipv6/Make.defs b/nuttx/configs/tm4c1294-launchpad/ipv6/Make.defs
index 918bf985f6..f4356f4b7f 100644
--- a/nuttx/configs/tm4c1294-launchpad/ipv6/Make.defs
+++ b/nuttx/configs/tm4c1294-launchpad/ipv6/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/dk-tm4c129x/ipv6/Make.defs
+# configs/tm4c1294-launchpad/ipv6/Make.defs
 #
 #   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/tm4c1294-launchpad/nsh/Make.defs b/nuttx/configs/tm4c1294-launchpad/nsh/Make.defs
index 377d1e1e39..2600f0f26e 100644
--- a/nuttx/configs/tm4c1294-launchpad/nsh/Make.defs
+++ b/nuttx/configs/tm4c1294-launchpad/nsh/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/tm4c1294-launchpad/nsh/Make.defs
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/tm4c1294-launchpad/nsh/setenv.sh b/nuttx/configs/tm4c1294-launchpad/nsh/setenv.sh
index a479847e40..5e22b317c2 100755
--- a/nuttx/configs/tm4c1294-launchpad/nsh/setenv.sh
+++ b/nuttx/configs/tm4c1294-launchpad/nsh/setenv.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # configs/tm4c1294-launchpad/nsh/setenv.sh
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/tm4c1294-launchpad/scripts/ld.script b/nuttx/configs/tm4c1294-launchpad/scripts/ld.script
index b60907a404..c47cb099a8 100755
--- a/nuttx/configs/tm4c1294-launchpad/scripts/ld.script
+++ b/nuttx/configs/tm4c1294-launchpad/scripts/ld.script
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/tm4c1294-launchpad/scripts/ld.script
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/tm4c1294-launchpad/src/Makefile b/nuttx/configs/tm4c1294-launchpad/src/Makefile
index 5ce6c83d28..8609a6a9c9 100644
--- a/nuttx/configs/tm4c1294-launchpad/src/Makefile
+++ b/nuttx/configs/tm4c1294-launchpad/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/dk-tm4c129x/src/Makefile
+# configs/tm4c1294-launchpad/src/Makefile
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h b/nuttx/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h
index 3f036109ed..0c20e8439a 100644
--- a/nuttx/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h
+++ b/nuttx/configs/tm4c1294-launchpad/src/tm4c1294-launchpad.h
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/tm4c1294-launchpad/src/ek-tm4c1294xl.h
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -177,4 +177,3 @@ int tiva_timer_initialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_TM4C1294_LAUNCHPAD_TM4C1294_LAUNCHPAD_H */
-
diff --git a/nuttx/configs/tm4c1294-launchpad/src/tm4c_autoleds.c b/nuttx/configs/tm4c1294-launchpad/src/tm4c_autoleds.c
index 940a24ff5c..bbba0ed795 100644
--- a/nuttx/configs/tm4c1294-launchpad/src/tm4c_autoleds.c
+++ b/nuttx/configs/tm4c1294-launchpad/src/tm4c_autoleds.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/tm4c1294-launchpad/src/tm4c_autoleds.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/tm4c1294-launchpad/src/tm4c_bringup.c b/nuttx/configs/tm4c1294-launchpad/src/tm4c_bringup.c
index c302f4084d..afaafaba4b 100644
--- a/nuttx/configs/tm4c1294-launchpad/src/tm4c_bringup.c
+++ b/nuttx/configs/tm4c1294-launchpad/src/tm4c_bringup.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * config/tm4c1294-launchpad/src/tm4c_bringup.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/tm4c1294-launchpad/src/tm4c_buttons.c b/nuttx/configs/tm4c1294-launchpad/src/tm4c_buttons.c
index b7300329aa..1ce04a4d92 100644
--- a/nuttx/configs/tm4c1294-launchpad/src/tm4c_buttons.c
+++ b/nuttx/configs/tm4c1294-launchpad/src/tm4c_buttons.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/tm4c1294-launchpad/src/tm4c_buttons.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/tm4c1294-launchpad/src/tm4c_nsh.c b/nuttx/configs/tm4c1294-launchpad/src/tm4c_nsh.c
index c22e7e40d3..8df992b266 100644
--- a/nuttx/configs/tm4c1294-launchpad/src/tm4c_nsh.c
+++ b/nuttx/configs/tm4c1294-launchpad/src/tm4c_nsh.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * config/tm4c1294-launchpad/src/tm4c_nsh.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/nuttx/configs/tm4c1294-launchpad/src/tm4c_ssi.c b/nuttx/configs/tm4c1294-launchpad/src/tm4c_ssi.c
index d5ecffc1e8..e4a6d0d69c 100644
--- a/nuttx/configs/tm4c1294-launchpad/src/tm4c_ssi.c
+++ b/nuttx/configs/tm4c1294-launchpad/src/tm4c_ssi.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/tm4c1294-launchpad/src/tm4c_ssi.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@
 #include "tiva_gpio.h"
 #include "tm4c1294-launchpad.h"
 
-/* The DK-TM4C129X microSD CS is on SSI0 */
+/* The TM4C1294-Launchpad microSD CS is on SSI0 */
 
 #if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1)
 
@@ -101,7 +101,7 @@ void weak_function tm4c_ssiinitialize(void)
  * The external functions, tiva_spiselect and tiva_spistatus must be provided
  * by board-specific logic.  The are implementations of the select and status
  * methods SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
- * All othermethods (including tiva_spiinitialize()) are provided by common
+ * All other methods (including tiva_spiinitialize()) are provided by common
  * logic.  To use this common SPI logic on your board:
  *
  *   1. Provide tiva_spiselect() and tiva_spistatus() functions in your
diff --git a/nuttx/configs/tm4c1294-launchpad/src/tm4c_timer.c b/nuttx/configs/tm4c1294-launchpad/src/tm4c_timer.c
index fe3eb51a27..bcf4a944f3 100644
--- a/nuttx/configs/tm4c1294-launchpad/src/tm4c_timer.c
+++ b/nuttx/configs/tm4c1294-launchpad/src/tm4c_timer.c
@@ -101,9 +101,11 @@ int tiva_timer_initialize(void)
 {
   int ret;
 
-  timvdbg("Registering TIMER%d at %s\n", GPTM, CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME);
+  timvdbg("Registering TIMER%d at %s\n",
+          GPTM, CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME);
 
-  ret = tiva_timer_register(CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME, GPTM, ALTCLK);
+  ret = tiva_timer_register(CONFIG_TM4C1294_LAUNCHPAD_TIMER_DEVNAME,
+                            GPTM, ALTCLK);
   if (ret < 0)
     {
       timdbg("ERROR: Failed to register timer driver: %d\n", ret);
diff --git a/nuttx/configs/tm4c1294-launchpad/src/tm4c_userleds.c b/nuttx/configs/tm4c1294-launchpad/src/tm4c_userleds.c
index 84d76482e7..b7218ddf3a 100644
--- a/nuttx/configs/tm4c1294-launchpad/src/tm4c_userleds.c
+++ b/nuttx/configs/tm4c1294-launchpad/src/tm4c_userleds.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * configs/tm4c1294-launchpad/src/tm4c_userleds.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without