sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The old lm/ directories were enamed tiva/ to better support new products coming down the pipe from TI

Browse Source
This commit is contained in:
Gregory Nutt 2014-03-08 12:31:06 -06:00
parent 0fb4a075d1
commit 88c2da5bc1
51 changed files with 166 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/Kconfig
View File

@ -69,10 +69,19 @@ config ARCH_CHIP_KL
Freescale Kinetis L Architectures (ARM Cortex-M0+)
config ARCH_CHIP_LM
bool "TI Stellaris"
bool "TI/Luminary Stellaris"
select ARCH_HAVE_CMNVECTOR
select ARCH_HAVE_MPU
---help---
TI Stellaris LMS3 and LM4F architectures (ARM Cortex-M3/4)
TI/Luminary Stellaris LMS3 and LM4F architectures (ARM Cortex-M3/4)
config ARCH_CHIP_TIVA
bool "TI Tiva"
select ARCH_HAVE_CMNVECTOR
select ARCH_HAVE_MPU
select ARCH_HAVE_FPU
---help---
TI Tiva TM4C architectures (ARM Cortex-M4)
config ARCH_CHIP_LPC17XX
bool "NXP LPC17xx"
@ -221,7 +230,7 @@ config ARCH_CHIP
default "imx" if ARCH_CHIP_IMX
default "kinetis" if ARCH_CHIP_KINETIS
default "kl" if ARCH_CHIP_KL
default "lm" if ARCH_CHIP_LM
default "tiva" if ARCH_CHIP_LM || ARCH_CHIP_TIVA
default "lpc17xx" if ARCH_CHIP_LPC17XX
default "lpc214x" if ARCH_CHIP_LPC214X
default "lpc2378" if ARCH_CHIP_LPC2378
@ -348,8 +357,8 @@ endif
if ARCH_CHIP_KL
source arch/arm/src/kl/Kconfig
endif
if ARCH_CHIP_LM
source arch/arm/src/lm/Kconfig
if ARCH_CHIP_LM || ARCH_CHIP_TIVA
source arch/arm/src/tiva/Kconfig
endif
if ARCH_CHIP_LPC17XX
source arch/arm/src/lpc17xx/Kconfig

2
arch/arm/include/lm/chip.h → arch/arm/include/tiva/chip.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/include/lm/chip.h
* arch/arm/include/tiva/chip.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>

8
arch/arm/include/lm/irq.h → arch/arm/include/tiva/irq.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/include/lm/irq.h
* arch/arm/include/tiva/irq.h
*
* Copyright (C) 2009-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -42,7 +42,7 @@
#include <nuttx/config.h>
#include <nuttx/irq.h>
#include <arch/lm/chip.h>
#include <arch/tiva/chip.h>
/************************************************************************************
* Pre-processor Definitions
@ -86,9 +86,9 @@
#define LM_IRQ_SYSTICK (15) /* Vector 15: System tick */
#if defined(CONFIG_ARCH_CHIP_LM3S)
# include <arch/lm/lm3s_irq.h>
# include <arch/tiva/lm3s_irq.h>
#elif defined(CONFIG_ARCH_CHIP_LM4F)
# include <arch/lm/lm4f_irq.h>
# include <arch/tiva/lm4f_irq.h>
#else
# error "Unsupported Stellaris IRQ file"
#endif

2
arch/arm/include/lm/lm3s_irq.h → arch/arm/include/tiva/lm3s_irq.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/include/lm/lm3s_irq.h
* arch/arm/include/tiva/lm3s_irq.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/arm/include/lm/lm4f_irq.h → arch/arm/include/tiva/lm4f_irq.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/include/lm/lm4f_irq.h
* arch/arm/include/tiva/lm4f_irq.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

37
arch/arm/src/lm/Kconfig → arch/arm/src/tiva/Kconfig
View File

@ -3,41 +3,47 @@
# see misc/tools/kconfig-language.txt.
#
comment "Stellaris Configuration Options"
comment "Tiva/Stellaris Configuration Options"
choice
prompt "Stellaris Chip Selection"
prompt "Tiva/Stellaris Chip Selection"
default ARCH_CHIP_LM3S6965
depends on ARCH_CHIP_LM
depends on ARCH_CHIP_LM || ARCH_CHIP_TIVA
config ARCH_CHIP_LM3S6918
bool "LM3S6918"
depends on ARCH_CHIP_LM
select ARCH_CORTEXM3
select ARCH_CHIP_LM3S
select LM_HAVE_SSI1
config ARCH_CHIP_LM3S9B96
bool "LM3S9B96"
depends on ARCH_CHIP_LM
select ARCH_CORTEXM3
select ARCH_CHIP_LM3S
config ARCH_CHIP_LM3S6432
bool "LM3S6432"
depends on ARCH_CHIP_LM
select ARCH_CORTEXM3
select ARCH_CHIP_LM3S
config ARCH_CHIP_LM3S6965
bool "LM3S6965"
depends on ARCH_CHIP_LM
select ARCH_CORTEXM3
select ARCH_CHIP_LM3S
config ARCH_CHIP_LM3S8962
bool "LM3S8962"
depends on ARCH_CHIP_LM
select ARCH_CORTEXM3
select ARCH_CHIP_LM3S
config ARCH_CHIP_LM4F120
bool "LM4F120"
depends on ARCH_CHIP_LM
select ARCH_CORTEXM4
select ARCH_CHIP_LM4F
select ARCH_HAVE_FPU
@ -52,6 +58,9 @@ config ARCH_CHIP_LM3S
config ARCH_CHIP_LM4F
bool
config ARCH_CHIP_TM4C
bool
config LM_HAVE_SSI1
bool
@ -62,7 +71,7 @@ config LM_REVA2
Some early silicon returned an increase LDO voltage or 2.75V to work
around a PLL bug
menu "Stellaris Peripheral Support"
menu "Tiva/Stellaris Peripheral Support"
config LM_UART0
bool "UART0"
@ -82,31 +91,31 @@ config LM_UART2
config LM_UART3
bool "UART3"
default n
depends on ARCH_CHIP_LM4F
depends on ARCH_CHIP_LM4F || ARCH_CHIP_TM4C
select ARCH_HAVE_UART3
config LM_UART4
bool "UART4"
default n
depends on ARCH_CHIP_LM4F
depends on ARCH_CHIP_LM4F || ARCH_CHIP_TM4C
select ARCH_HAVE_UART4
config LM_UART5
bool "UART5"
default n
depends on ARCH_CHIP_LM4F
depends on ARCH_CHIP_LM4F || ARCH_CHIP_TM4C
select ARCH_HAVE_UART5
config LM_UART6
bool "UART6"
default n
depends on ARCH_CHIP_LM4F
depends on ARCH_CHIP_LM4F || ARCH_CHIP_TM4C
select ARCH_HAVE_UART6
config LM_UART7
bool "UART7"
default n
depends on ARCH_CHIP_LM4F
depends on ARCH_CHIP_LM4F || ARCH_CHIP_TM4C
select ARCH_HAVE_UART7
config SSI0_DISABLE
@ -118,14 +127,14 @@ config SSI1_DISABLE
default y
config LM_ETHERNET
bool "Stellaris Ethernet"
bool "Ethernet"
default n
select NETDEVICES
---help---
This must be set (along with NET) to build the Stellaris Ethernet driver.
config LM_FLASH
bool "Stellaris internal FLASH"
bool "Internal FLASH driver"
default n
---help---
Enable MTD driver support for internal FLASH.
@ -173,7 +182,7 @@ config LM_DISABLE_GPIOJ_IRQS
endmenu
if LM_ETHERNET
menu "Stellaris Ethernet Configuration"
menu "Tiva/Stellaris Ethernet Configuration"
config LM_ETHLEDS
bool "Ethernet LEDs"
@ -238,7 +247,7 @@ endmenu
endif
if !SSI0_DISABLE || !SSI1_DISABLE
menu "Stellaris SSI Configuration"
menu "Tiva/Stellaris SSI Configuration"
config SSI_POLLWAIT
bool "Poll Wait (No-Interrupt) Mode"
@ -254,7 +263,7 @@ endmenu
endif
if LM_FLASH
menu "Stellaris Internal Flash Driver Configuration"
menu "Tiva/Stellaris Internal Flash Driver Configuration"
config LM_FLASH_STARTPAGE
int "First page accessible by the MTD driver"

2
arch/arm/src/lm/Make.defs → arch/arm/src/tiva/Make.defs
View File

@ -1,5 +1,5 @@
############################################################################
# arch/arm/src/lm/Make.defs
# arch/arm/src/tiva/Make.defs
#
# Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>

10
arch/arm/src/lm/chip.h → arch/arm/src/tiva/chip.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip.h
* arch/arm/src/tiva/chip.h
*
* Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_H
#define __ARCH_ARM_SRC_LM_CHIP_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_H
#define __ARCH_ARM_SRC_TIVA_CHIP_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <arch/lm/chip.h>
#include <arch/tiva/chip.h>
/* Then get all of the register definitions */
@ -70,4 +70,4 @@
* Public Function Prototypes
****************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_H */

8
arch/arm/src/lm/chip/lm3s_memorymap.h → arch/arm/src/tiva/chip/lm3s_memorymap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm3s_memorymap.h
* arch/arm/src/tiva/chip/lm3s_memorymap.h
*
* Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_MEMORYMAP_H
#define __ARCH_ARM_SRC_LM_CHIP_LM3S_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM3S_MEMORYMAP_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM3S_MEMORYMAP_H
/************************************************************************************
* Included Files
@ -357,4 +357,4 @@
* Public Function Prototypes
************************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM3S_MEMORYMAP_H */

8
arch/arm/src/lm/chip/lm3s_pinmap.h → arch/arm/src/tiva/chip/lm3s_pinmap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm3s_pinmap.h
* arch/arm/src/tiva/chip/lm3s_pinmap.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_PINMAP_H
#define __ARCH_ARM_SRC_LM_CHIP_LM3S_PINMAP_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM3S_PINMAP_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM3S_PINMAP_H
/************************************************************************************
* Included Files
@ -278,4 +278,4 @@
* Public Function Prototypes
****************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_PINMAP_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM3S_PINMAP_H */

8
arch/arm/src/lm/chip/lm3s_syscontrol.h → arch/arm/src/tiva/chip/lm3s_syscontrol.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm3s_syscontrol.h
* arch/arm/src/tiva/chip/lm3s_syscontrol.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM3S_SYSCONTROL_H
#define __ARCH_ARM_SRC_LM_CHIP_LM3S_SYSCONTROL_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM3S_SYSCONTROL_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM3S_SYSCONTROL_H
/************************************************************************************
* Included Files
@ -492,4 +492,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM3S_SYSCONTROL_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM3S_SYSCONTROL_H */

2
arch/arm/src/lm/chip/lm3s_vectors.h → arch/arm/src/tiva/chip/lm3s_vectors.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm3s_vectors.S
* arch/arm/src/tiva/chip/lm3s_vectors.S
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

8
arch/arm/src/lm/chip/lm4f_memorymap.h → arch/arm/src/tiva/chip/lm4f_memorymap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm4f_memorymap.h
* arch/arm/src/tiva/chip/lm4f_memorymap.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
@ -34,8 +34,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM4F_MEMORYMAP_H
#define __ARCH_ARM_SRC_LM_CHIP_LM4F_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM4F_MEMORYMAP_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM4F_MEMORYMAP_H
/************************************************************************************
* Included Files
@ -168,4 +168,4 @@
* Public Function Prototypes
************************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM4F_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM4F_MEMORYMAP_H */

8
arch/arm/src/lm/chip/lm4f_pinmap.h → arch/arm/src/tiva/chip/lm4f_pinmap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm4f_pinmap.h
* arch/arm/src/tiva/chip/lm4f_pinmap.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM4F_PINMAP_H
#define __ARCH_ARM_SRC_LM_CHIP_LM4F_PINMAP_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM4F_PINMAP_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM4F_PINMAP_H
/************************************************************************************
* Included Files
@ -212,4 +212,4 @@
* Public Function Prototypes
****************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM4F_PINMAP_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM4F_PINMAP_H */

8
arch/arm/src/lm/chip/lm4f_syscontrol.h → arch/arm/src/tiva/chip/lm4f_syscontrol.h
View File

@ -1,5 +1,5 @@
/********************************************************************************************
* arch/arm/src/lm/chip/lm4f_syscontrol.h
* arch/arm/src/tiva/chip/lm4f_syscontrol.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
********************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM4F_SYSCONTROL_H
#define __ARCH_ARM_SRC_LM_CHIP_LM4F_SYSCONTROL_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM4F_SYSCONTROL_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM4F_SYSCONTROL_H
/********************************************************************************************
* Included Files
@ -1529,4 +1529,4 @@
* Public Functions
********************************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM4F_SYSCONTROL_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM4F_SYSCONTROL_H */

2
arch/arm/src/lm/chip/lm4f_vectors.h → arch/arm/src/tiva/chip/lm4f_vectors.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm4f_vectors.S
* arch/arm/src/tiva/chip/lm4f_vectors.S
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

8
arch/arm/src/lm/chip/lm_epi.h → arch/arm/src/tiva/chip/lm_epi.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_epi.h
* arch/arm/src/tiva/chip/lm_epi.h
*
* Copyright (C) 2009-2013 Max Neklyudov. All rights reserved.
* Author: Max Neklyudov <macscomp@gmail.com>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_EPI_H
#define __ARCH_ARM_SRC_LM_CHIP_LM_EPI_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM_EPI_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM_EPI_H
/************************************************************************************
* Included Files
@ -110,4 +110,4 @@
#define EPI_BAUD_COUNT0_MASK (0xFFFF << EPI_BAUD_COUNT0_SHIFT)
# define EPI_BAUD_COUNT0(n) ((n) << EPI_BAUD_COUNT0_SHIFT)
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_EPI_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM_EPI_H */

8
arch/arm/src/lm/chip/lm_ethernet.h → arch/arm/src/tiva/chip/lm_ethernet.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_ethernet.h
* arch/arm/src/tiva/chip/lm_ethernet.h
*
* Copyright (C) 2009-2010, 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_ETHERNET_H
#define __ARCH_ARM_SRC_LM_CHIP_LM_ETHERNET_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM_ETHERNET_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM_ETHERNET_H
/************************************************************************************
* Included Files
@ -200,4 +200,4 @@
* Public Function Prototypes
************************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_ETHERNET_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM_ETHERNET_H */

8
arch/arm/src/lm/chip/lm_flash.h → arch/arm/src/tiva/chip/lm_flash.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_flash.h
* arch/arm/src/tiva/chip/lm_flash.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_FLASH_H
#define __ARCH_ARM_SRC_LM_CHIP_LM_FLASH_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM_FLASH_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM_FLASH_H
/************************************************************************************
* Included Files
@ -154,4 +154,4 @@
* Public Function Prototypes
************************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_FLASH_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM_FLASH_H */

8
arch/arm/src/lm/chip/lm_gpio.h → arch/arm/src/tiva/chip/lm_gpio.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_gpio.h
* arch/arm/src/tiva/chip/lm_gpio.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Authors: Gregory Nutt <gnutt@nuttx.org>
@ -34,8 +34,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_GPIO_H
#define __ARCH_ARM_SRC_LM_CHIP_LM_GPIO_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM_GPIO_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM_GPIO_H
/************************************************************************************
* Included Files
@ -517,4 +517,4 @@
* Public Function Prototypes
************************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_GPIO_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM_GPIO_H */

8
arch/arm/src/lm/chip/lm_i2c.h → arch/arm/src/tiva/chip/lm_i2c.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_i2c.h
* arch/arm/src/tiva/chip/lm_i2c.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_I2C_H
#define __ARCH_ARM_SRC_LM_CHIP_LM_I2C_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM_I2C_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM_I2C_H
/************************************************************************************
* Included Files
@ -244,4 +244,4 @@
* Public Function Prototypes
****************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_I2C_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM_I2C_H */

8
arch/arm/src/lm/chip/lm_memorymap.h → arch/arm/src/tiva/chip/lm_memorymap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_memorymap.h
* arch/arm/src/tiva/chip/lm_memorymap.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_MEMORYMAP_H
#define __ARCH_ARM_SRC_LM_CHIP_LM_MEMORYMAP_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM_MEMORYMAP_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM_MEMORYMAP_H
/************************************************************************************
* Included Files
@ -68,4 +68,4 @@
* Public Function Prototypes
************************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_MEMORYMAP_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM_MEMORYMAP_H */

8
arch/arm/src/lm/chip/lm_pinmap.h → arch/arm/src/tiva/chip/lm_pinmap.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_pinmap.h
* arch/arm/src/tiva/chip/lm_pinmap.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_PINMAP_H
#define __ARCH_ARM_SRC_LM_CHIP_LM_PINMAP_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM_PINMAP_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM_PINMAP_H
/************************************************************************************
* Included Files
@ -68,4 +68,4 @@
* Public Function Prototypes
************************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_PINMAP_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM_PINMAP_H */

8
arch/arm/src/lm/chip/lm_ssi.h → arch/arm/src/tiva/chip/lm_ssi.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_ssi.h
* arch/arm/src/tiva/chip/lm_ssi.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_SSI_H
#define __ARCH_ARM_SRC_LM_CHIP_LM_SSI_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM_SSI_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM_SSI_H
/************************************************************************************
* Included Files
@ -232,4 +232,4 @@
************************************************************************************/
#endif /* LM_NSSI > 0 */
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_SSI_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM_SSI_H */

10
arch/arm/src/lm/chip/lm_syscontrol.h → arch/arm/src/tiva/chip/lm_syscontrol.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_syscontrol.h
* arch/arm/src/tiva/chip/lm_syscontrol.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,15 +33,15 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_SYSCONTROL_H
#define __ARCH_ARM_SRC_LM_CHIP_LM_SYSCONTROL_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM_SYSCONTROL_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM_SYSCONTROL_H
/************************************************************************************
* Included Files
************************************************************************************/
#include <nuttx/config.h>
#include <arch/lm/chip.h>
#include <arch/tiva/chip.h>
/* Include the system control header file for the specific Stellaris chip */
@ -69,4 +69,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_SYSCONTROL_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM_SYSCONTROL_H */

8
arch/arm/src/lm/chip/lm_timer.h → arch/arm/src/tiva/chip/lm_timer.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_timer.h
* arch/arm/src/tiva/chip/lm_timer.h
*
* Copyright (C) 2012 Max Nekludov. All rights reserved.
* Author: Max Nekludov <macscomp@gmail.com>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_TIMER_H
#define __ARCH_ARM_SRC_LM_CHIP_LM_TIMER_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM_TIMER_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM_TIMER_H
/************************************************************************************
* Included Files
@ -122,4 +122,4 @@
#define TIMER_GPTMICR_TATOCINT_SHIFT 0 /* Bits 0: GPTM Timer A Time-Out Raw Interrupt Clear*/
#define TIMER_GPTMICR_TATOCINT_MASK (0x01 << TIMER_GPTMICR_TATOCINT_SHIFT)
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_TIMER_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM_TIMER_H */

8
arch/arm/src/lm/chip/lm_uart.h → arch/arm/src/tiva/chip/lm_uart.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_uart.h
* arch/arm/src/tiva/chip/lm_uart.h
*
* Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_CHIP_LM_UART_H
#define __ARCH_ARM_SRC_LM_CHIP_LM_UART_H
#ifndef __ARCH_ARM_SRC_TIVA_CHIP_LM_UART_H
#define __ARCH_ARM_SRC_TIVA_CHIP_LM_UART_H
/************************************************************************************
* Included Files
@ -344,4 +344,4 @@
* Public Functions
************************************************************************************/
#endif /* __ARCH_ARM_SRC_LM_CHIP_LM_UART_H */
#endif /* __ARCH_ARM_SRC_TIVA_CHIP_LM_UART_H */

2
arch/arm/src/lm/chip/lm_vectors.h → arch/arm/src/tiva/chip/lm_vectors.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/chip/lm_vectors.h
* arch/arm/src/tiva/chip/lm_vectors.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/arm/src/lm/lm_allocateheap.c → arch/arm/src/tiva/lm_allocateheap.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_allocateheap.c
* arch/arm/src/tiva/lm_allocateheap.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/arm/src/lm/lm_dumpgpio.c → arch/arm/src/tiva/lm_dumpgpio.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_dumpgpio.c
* arch/arm/src/tiva/lm_dumpgpio.c
*
* Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/arm/src/lm/lm_ethernet.c → arch/arm/src/tiva/lm_ethernet.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_ethernet.c
* arch/arm/src/tiva/lm_ethernet.c
*
* Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

8
arch/arm/src/lm/lm_ethernet.h → arch/arm/src/tiva/lm_ethernet.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/lm_ethernet.h
* arch/arm/src/tiva/lm_ethernet.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_LM_ETHERNET_H
#define __ARCH_ARM_SRC_LM_LM_ETHERNET_H
#ifndef __ARCH_ARM_SRC_TIVA_LM_ETHERNET_H
#define __ARCH_ARM_SRC_TIVA_LM_ETHERNET_H
/************************************************************************************
* Included Files
@ -100,4 +100,4 @@ int lm_ethinitialize(int intf);
#endif /* __ASSEMBLY__ */
#endif /* LM_NETHCONTROLLERS > 1 */
#endif /* __ARCH_ARM_SRC_LM_LM_ETHERNET_H */
#endif /* __ARCH_ARM_SRC_TIVA_LM_ETHERNET_H */

2
arch/arm/src/lm/lm_flash.c → arch/arm/src/tiva/lm_flash.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_flash.c
* arch/arm/src/tiva/lm_flash.c
*
* Copyright (c) 2013 Max Holtzberg. All rights reserved.
* Copyright (C) 2013 Gregory Nutt. All rights reserved.

2
arch/arm/src/lm/lm_gpio.c → arch/arm/src/tiva/lm_gpio.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_gpio.c
* arch/arm/src/tiva/lm_gpio.c
* arch/arm/src/chip/lm_gpio.c
*
* Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.

8
arch/arm/src/lm/lm_gpio.h → arch/arm/src/tiva/lm_gpio.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/lm_gpio.h
* arch/arm/src/tiva/lm_gpio.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_LM_GPIO_H
#define __ARCH_ARM_SRC_LM_LM_GPIO_H
#ifndef __ARCH_ARM_SRC_TIVA_LM_GPIO_H
#define __ARCH_ARM_SRC_TIVA_LM_GPIO_H
/************************************************************************************
* Included Files
@ -261,4 +261,4 @@ int weak_function gpio_irqinitialize(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_LM_LM_GPIO_H */
#endif /* __ARCH_ARM_SRC_TIVA_LM_GPIO_H */

2
arch/arm/src/lm/lm_gpioirq.c → arch/arm/src/tiva/lm_gpioirq.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_gpioirq.c
* arch/arm/src/tiva/lm_gpioirq.c
* arch/arm/src/chip/lm_gpioirq.c
*
* Copyright (C) 2009-2010, 2012 Gregory Nutt. All rights reserved.

2
arch/arm/src/lm/lm_irq.c → arch/arm/src/tiva/lm_irq.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_irq.c
* arch/arm/src/tiva/lm_irq.c
* arch/arm/src/chip/lm_irq.c
*
* Copyright (C) 2009, 2011, 2013-2014 Gregory Nutt. All rights reserved.

2
arch/arm/src/lm/lm_lowputc.c → arch/arm/src/tiva/lm_lowputc.c
View File

@ -1,5 +1,5 @@
/**************************************************************************
* arch/arm/src/lm/lm_lowputc.c
* arch/arm/src/tiva/lm_lowputc.c
*
* Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

8
arch/arm/src/lm/lm_lowputc.h → arch/arm/src/tiva/lm_lowputc.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/lm_lowputc.h
* arch/arm/src/tiva/lm_lowputc.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_LM_LOWPUTC_H
#define __ARCH_ARM_SRC_LM_LM_LOWPUTC_H
#ifndef __ARCH_ARM_SRC_TIVA_LM_LOWPUTC_H
#define __ARCH_ARM_SRC_TIVA_LM_LOWPUTC_H
/************************************************************************************
* Included Files
@ -202,4 +202,4 @@ void up_lowsetup(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_LM_LM_LOWPUTC_H */
#endif /* __ARCH_ARM_SRC_TIVA_LM_LOWPUTC_H */

2
arch/arm/src/lm/lm_mpuinit.c → arch/arm/src/tiva/lm_mpuinit.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_mpuinit.c
* arch/arm/src/tiva/lm_mpuinit.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

8
arch/arm/src/lm/lm_mpuinit.h → arch/arm/src/tiva/lm_mpuinit.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/lm_mpuinit.h
* arch/arm/src/tiva/lm_mpuinit.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_LM_MPUINIT_H
#define __ARCH_ARM_SRC_LM_LM_MPUINIT_H
#ifndef __ARCH_ARM_SRC_TIVA_LM_MPUINIT_H
#define __ARCH_ARM_SRC_TIVA_LM_MPUINIT_H
/************************************************************************************
* Included Files
@ -87,4 +87,4 @@ void lm_mpu_uheap(uintptr_t start, size_t size);
# define lm_mpu_uheap(start,size)
#endif
#endif /* __ARCH_ARM_SRC_LM_LM_MPUINIT_H */
#endif /* __ARCH_ARM_SRC_TIVA_LM_MPUINIT_H */

2
arch/arm/src/lm/lm_serial.c → arch/arm/src/tiva/lm_serial.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_serial.c
* arch/arm/src/tiva/lm_serial.c
*
* Copyright (C) 2009-2010, 2012-2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/arm/src/lm/lm_ssi.c → arch/arm/src/tiva/lm_ssi.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_ssi.c
* arch/arm/src/tiva/lm_ssi.c
*
* Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

8
arch/arm/src/lm/lm_ssi.h → arch/arm/src/tiva/lm_ssi.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/lm_ssi.h
* arch/arm/src/tiva/lm_ssi.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_LM_SSI_H
#define __ARCH_ARM_SRC_LM_LM_SSI_H
#ifndef __ARCH_ARM_SRC_TIVA_LM_SSI_H
#define __ARCH_ARM_SRC_TIVA_LM_SSI_H
/************************************************************************************
* Included Files
@ -111,4 +111,4 @@ int lm_spicmddata(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool cmd);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_LM_LM_SSI_H */
#endif /* __ARCH_ARM_SRC_TIVA_LM_SSI_H */

2
arch/arm/src/lm/lm_start.c → arch/arm/src/tiva/lm_start.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_start.c
* arch/arm/src/tiva/lm_start.c
* arch/arm/src/chip/lm_start.c
*
* Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.

2
arch/arm/src/lm/lm_syscontrol.c → arch/arm/src/tiva/lm_syscontrol.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_syscontrol.c
* arch/arm/src/tiva/lm_syscontrol.c
* arch/arm/src/chip/lm_syscontrol.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.

8
arch/arm/src/lm/lm_syscontrol.h → arch/arm/src/tiva/lm_syscontrol.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/lm_syscontrol.h
* arch/arm/src/tiva/lm_syscontrol.h
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_LM_SYSCONTROL_H
#define __ARCH_ARM_SRC_LM_LM_SYSCONTROL_H
#ifndef __ARCH_ARM_SRC_TIVA_LM_SYSCONTROL_H
#define __ARCH_ARM_SRC_TIVA_LM_SYSCONTROL_H
/************************************************************************************
* Included Files
@ -97,4 +97,4 @@ void up_clockconfig(void);
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_LM_LM_SYSCONTROL_H */
#endif /* __ARCH_ARM_SRC_TIVA_LM_SYSCONTROL_H */

2
arch/arm/src/lm/lm_timerisr.c → arch/arm/src/tiva/lm_timerisr.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_timerisr.c
* arch/arm/src/tiva/lm_timerisr.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
arch/arm/src/lm/lm_userspace.c → arch/arm/src/tiva/lm_userspace.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* arch/arm/src/lm/lm_userspace.c
* arch/arm/src/tiva/lm_userspace.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

8
arch/arm/src/lm/lm_userspace.h → arch/arm/src/tiva/lm_userspace.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/lm_userspace.h
* arch/arm/src/tiva/lm_userspace.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef __ARCH_ARM_SRC_LM_LM_USERSPACE_H
#define __ARCH_ARM_SRC_LM_LM_USERSPACE_H
#ifndef __ARCH_ARM_SRC_TIVA_LM_USERSPACE_H
#define __ARCH_ARM_SRC_TIVA_LM_USERSPACE_H
/************************************************************************************
* Included Files
@ -73,4 +73,4 @@
void lm_userspace(void);
#endif
#endif /* __ARCH_ARM_SRC_LM_LM_USERSPACE_H */
#endif /* __ARCH_ARM_SRC_TIVA_LM_USERSPACE_H */

2
arch/arm/src/lm/lm_vectors.S → arch/arm/src/tiva/lm_vectors.S
View File

@ -1,5 +1,5 @@
/************************************************************************************
* arch/arm/src/lm/lm_vectors.S
* arch/arm/src/tiva/lm_vectors.S
* arch/arm/src/chip/lm_vectors.S
*
* Copyright (C) 2009-2010, 2013 Gregory Nutt. All rights reserved.