From 814696561e37dd9dbdb58967273826137dcd8b96 Mon Sep 17 00:00:00 2001 From: sauttefk Date: Tue, 24 Feb 2015 02:36:37 +0100 Subject: Fixed cut & paste error. corrected naming of Tiva series developement boards. --- nuttx/Documentation/NuttX.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 8bb462992..d0e699e8d 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -3521,26 +3521,26 @@ nsh>

TI Tiva TM4C123G. - This port uses the TI Tiva TM4C123G LaunchPad. + This port uses the Tiva C Series TM4C123G LaunchPad Evaluation Kit (EK-TM4C123GXL).

@@ -3554,19 +3554,19 @@ nsh>

TI Tiva TM4C1294. - This port uses the TI Tiva TM4C1294 LaunchPad. + This port uses the TI Tiva C Series TM4C1294 Connected LaunchPad (EK-TM4C1294XL).

@@ -3580,14 +3580,14 @@ nsh>

TI Tiva TM4C129X. - This port uses the TI Tiva DK-TM4C129X Connected Development Kit. + This port uses the TI Tiva C Series TM4C129x Connected Development Kit (DK-TM4C129X).

-- cgit v1.2.3 From 364157d84762403a37c56fe1ae2a1e4db41b18ad Mon Sep 17 00:00:00 2001 From: sauttefk Date: Tue, 24 Feb 2015 02:37:17 +0100 Subject: Added some Eclipse files to .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 83f6546a6..f54ddffcd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,7 @@ Make.dep core .gdbinit cscope.out +.cproject +.project +.settings + -- cgit v1.2.3 From eda82a31de31749ab331f2bd1413018ad106c34d Mon Sep 17 00:00:00 2001 From: sauttefk Date: Tue, 24 Feb 2015 03:29:02 +0100 Subject: EK-TM4C1294XL Launchpad has no SD-card socket --- nuttx/configs/tm4c1294-launchpad/src/Makefile | 2 +- nuttx/configs/tm4c1294-launchpad/src/tm4c_ssi.c | 132 ------------------------ 2 files changed, 1 insertion(+), 133 deletions(-) delete mode 100644 nuttx/configs/tm4c1294-launchpad/src/tm4c_ssi.c diff --git a/nuttx/configs/tm4c1294-launchpad/src/Makefile b/nuttx/configs/tm4c1294-launchpad/src/Makefile index 7480e46af..4895ec216 100644 --- a/nuttx/configs/tm4c1294-launchpad/src/Makefile +++ b/nuttx/configs/tm4c1294-launchpad/src/Makefile @@ -39,7 +39,7 @@ CFLAGS += -I$(TOPDIR)/sched ASRCS = AOBJS = $(ASRCS:.S=$(OBJEXT)) -CSRCS = tm4c_boot.c tm4c_bringup.c tm4c_ssi.c +CSRCS = tm4c_boot.c tm4c_bringup.c ifeq ($(CONFIG_ARCH_LEDS),y) CSRCS += tm4c_autoleds.c diff --git a/nuttx/configs/tm4c1294-launchpad/src/tm4c_ssi.c b/nuttx/configs/tm4c1294-launchpad/src/tm4c_ssi.c deleted file mode 100644 index e4a6d0d69..000000000 --- a/nuttx/configs/tm4c1294-launchpad/src/tm4c_ssi.c +++ /dev/null @@ -1,132 +0,0 @@ -/************************************************************************************ - * configs/tm4c1294-launchpad/src/tm4c_ssi.c - * - * Copyright (C) 2015 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * 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 - -#include -#include -#include - -#include -#include - -#include "up_arch.h" -#include "chip.h" -#include "tiva_gpio.h" -#include "tm4c1294-launchpad.h" - -/* The TM4C1294-Launchpad microSD CS is on SSI0 */ - -#if defined(CONFIG_TIVA_SSI0) || defined(CONFIG_TIVA_SSI1) - -/************************************************************************************ - * Pre-processor Definitions - ************************************************************************************/ - -/* CONFIG_DEBUG_SPI enables debug output from this file (needs CONFIG_DEBUG too) */ - -#ifdef CONFIG_DEBUG_SPI -# define ssidbg lldbg -#else -# define ssidbg(x...) -#endif - -/* Dump GPIO registers */ - -#if defined(CONFIG_DEBUG_SPI) && defined(CONFIG_DEBUG_VERBOSE) -# define ssivdbg lldbg -# define ssi_dumpgpio(m) tiva_dumpgpio(SDCCS_GPIO, m) -#else -# define ssivdbg(x...) -# define ssi_dumpgpio(m) -#endif - -/************************************************************************************ - * Private Functions - ************************************************************************************/ - -/************************************************************************************ - * Public Functions - ************************************************************************************/ - -/************************************************************************************ - * Name: tm4c_ssiinitialize - * - * Description: - * Called to configure SPI chip select GPIO pins for the DK-TM4C129X. - * - ************************************************************************************/ - -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 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 - * board-specific logic. This function will perform chip selection and - * status operations using GPIOs in the way your board is configured. - * 2. Add a call to tiva_spiinitialize() in your low level initialization - * logic - * 3. The handle returned by tiva_spiinitialize() may then be used to bind the - * SPI driver to higher level logic (e.g., calling - * mmcsd_spislotinitialize(), for example, will bind the SPI driver to - * the SPI MMC/SD driver). - * - ****************************************************************************/ - -void tiva_spiselect(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool selected) -{ - ssidbg("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert"); - ssi_dumpgpio("tiva_spiselect() Entry"); - ssi_dumpgpio("tiva_spiselect() Exit"); -} - -uint8_t tiva_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) -{ - ssidbg("Returning SPI_STATUS_PRESENT\n"); - return SPI_STATUS_PRESENT; -} - -#endif /* CONFIG_TIVA_SSI0 || CONFIG_TIVA_SSI1 */ -- cgit v1.2.3 From 45e0cf1f4a7664974933db2a408ccea6acad4eff Mon Sep 17 00:00:00 2001 From: sauttefk Date: Tue, 24 Feb 2015 03:31:12 +0100 Subject: Fix SSI TX and RX legacy mapping of TM4C1294NC --- nuttx/arch/arm/src/tiva/chip/tm4c_pinmap.h | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/nuttx/arch/arm/src/tiva/chip/tm4c_pinmap.h b/nuttx/arch/arm/src/tiva/chip/tm4c_pinmap.h index ab6b619a7..df5251e0e 100644 --- a/nuttx/arch/arm/src/tiva/chip/tm4c_pinmap.h +++ b/nuttx/arch/arm/src/tiva/chip/tm4c_pinmap.h @@ -1310,34 +1310,38 @@ # define GPIO_SSI0_CLK (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTA | GPIO_PIN_2) # define GPIO_SSI0_FSS (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTA | GPIO_PIN_3) +# define GPIO_SSI0_TX (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTA | GPIO_PIN_4) # define GPIO_SSI0_XDAT0 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTA | GPIO_PIN_4) +# define GPIO_SSI0_RX (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTA | GPIO_PIN_5) # define GPIO_SSI0_XDAT1 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTA | GPIO_PIN_5) # define GPIO_SSI0_XDAT2 (GPIO_FUNC_PFIO | GPIO_ALT_12 | GPIO_PORTA | GPIO_PIN_6) # define GPIO_SSI0_XDAT3 (GPIO_FUNC_PFIO | GPIO_ALT_12 | GPIO_PORTA | GPIO_PIN_7) # define GPIO_SSI1_CLK (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTB | GPIO_PIN_5) # define GPIO_SSI1_FSS (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTB | GPIO_PIN_4) +# define GPIO_SSI1_TX (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTE | GPIO_PIN_4) # define GPIO_SSI1_XDAT0 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTE | GPIO_PIN_4) +# define GPIO_SSI1_RX (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTE | GPIO_PIN_5) # define GPIO_SSI1_XDAT1 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTE | GPIO_PIN_5) # define GPIO_SSI1_XDAT2 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_4) # define GPIO_SSI1_XDAT3 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_5) -# define GPIO_SSI2_CLK_1 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_3) -# define GPIO_SSI2_CLK_2 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTG | GPIO_PIN_7) -# define GPIO_SSI2_FSS_1 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_2) -# define GPIO_SSI2_FSS_2 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTG | GPIO_PIN_6) -# define GPIO_SSI2_XDAT0_1 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_1) -# define GPIO_SSI2_XDAT0_2 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTG | GPIO_PIN_5) -# define GPIO_SSI2_XDAT1_1 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_0) -# define GPIO_SSI2_XDAT1_2 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTG | GPIO_PIN_4) -# define GPIO_SSI2_XDAT2_1 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_7) -# define GPIO_SSI2_XDAT2_2 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTG | GPIO_PIN_3) -# define GPIO_SSI2_XDAT3_1 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_6) -# define GPIO_SSI2_XDAT3_2 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTG | GPIO_PIN_2) +# define GPIO_SSI2_CLK (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_3) +# define GPIO_SSI2_FSS (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_2) +# define GPIO_SSI2_TX (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_1) +# define GPIO_SSI2_XDAT0 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_1) +# define GPIO_SSI2_RX (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_0) +# define GPIO_SSI2_XDAT1 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_0) +# define GPIO_SSI2_XDAT2 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_7) +# define GPIO_SSI2_XDAT3 (GPIO_FUNC_PFIO | GPIO_ALT_14 | GPIO_PORTD | GPIO_PIN_6) # define GPIO_SSI3_CLK_1 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTF | GPIO_PIN_3) # define GPIO_SSI3_CLK_2 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTQ | GPIO_PIN_0) # define GPIO_SSI3_FSS_1 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTF | GPIO_PIN_2) # define GPIO_SSI3_FSS_2 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTQ | GPIO_PIN_1) +# define GPIO_SSI3_TX_1 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTF | GPIO_PIN_1) +# define GPIO_SSI3_TX_2 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTQ | GPIO_PIN_2) # define GPIO_SSI3_XDAT0_1 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTF | GPIO_PIN_1) # define GPIO_SSI3_XDAT0_2 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTQ | GPIO_PIN_2) +# define GPIO_SSI3_RX_1 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTF | GPIO_PIN_0) +# define GPIO_SSI3_RX_2 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTQ | GPIO_PIN_3) # define GPIO_SSI3_XDAT1_1 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTF | GPIO_PIN_0) # define GPIO_SSI3_XDAT1_2 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTQ | GPIO_PIN_3) # define GPIO_SSI3_XDAT2_1 (GPIO_FUNC_PFIO | GPIO_ALT_13 | GPIO_PORTF | GPIO_PIN_4) -- cgit v1.2.3