CC3200 Launchpad updates

3 files changed, 84 insertions, 3 deletions

diff --git a/nuttx/arch/arm/src/tiva/Kconfig b/nuttx/arch/arm/src/tiva/Kconfig
index d346ad2c5..6a469c922 100644
--- a/nuttx/arch/arm/src/tiva/Kconfig
+++ b/nuttx/arch/arm/src/tiva/Kconfig
@@ -91,6 +91,10 @@ config LM_REVA2
 		Some early silicon returned an increase LDO voltage or 2.75V to work
 		around a PLL bug
 
+config TIVA_BOARD_EARLYINIT
+	bool
+	default n
+
 menu "Tiva/Stellaris Peripheral Support"
 
 config TIVA_UART0
diff --git a/nuttx/arch/arm/src/tiva/tiva_start.c b/nuttx/arch/arm/src/tiva/tiva_start.c
index ff0e7a10e..f0c66f6d2 100644
--- a/nuttx/arch/arm/src/tiva/tiva_start.c
+++ b/nuttx/arch/arm/src/tiva/tiva_start.c
@@ -52,6 +52,7 @@
 #include "tiva_lowputc.h"
 #include "tiva_syscontrol.h"
 #include "tiva_userspace.h"
+#include "tiva_start.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -102,10 +103,10 @@ void __start(void)
 #endif
   uint32_t *dest;
 
-  /* Configure the uart so that we can get debug output as soon as possible */
+  /* Configure the UART so that we can get debug output as soon as possible */
 
-#ifdef CONFIG_ARCH_BOARD_CC3200_LAUNCHPAD
-  up_earlyconsoleinit();
+#ifdef CONFIG_TIVA_BOARD_EARLYINIT
+  board_earlyinit();
 #else
   up_clockconfig();
   up_lowsetup();
diff --git a/nuttx/arch/arm/src/tiva/tiva_start.h b/nuttx/arch/arm/src/tiva/tiva_start.h
new file mode 100644
index 000000000..ab4a2cd92
--- /dev/null
+++ b/nuttx/arch/arm/src/tiva/tiva_start.h
@@ -0,0 +1,76 @@
+/****************************************************************************
+ * arch/arm/src/tiva/tiva_start.h
+ *
+ *   Copyright (C) 2014 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.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_ARM_SRC_TIVA_TIVA_START_H
+#define __ARCH_ARM_SRC_TIVA_TIVA_START_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: board_earlyinit
+ *
+ * Description:
+ *   If CONFIG_TIVA_BOARD_EARLYINIT, then board-specific logic must provide
+ *   the function board_earlyinit() to provide very customized lower-level
+ *   board bringup.  board_earlyinit() will be called by the start-up logic
+ *   instead of up_clockconfig() and up_lowsetup().
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_TIVA_BOARD_EARLYINIT
+void board_earlyinit(void);
+#endif
+
+#endif /* __ARCH_ARM_SRC_TIVA_TIVA_START_H */