diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-03-08 12:31:06 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-03-08 12:31:06 -0600 |
commit | 39d69550a195f226b1985ebc62f760d286cd68c8 (patch) | |
tree | 3efd0ea969c684d257a3266235b5685977d913ce /nuttx/arch/arm/src | |
parent | d6ad8ebe0f0051c96688a0302154117c16d413de (diff) | |
download | nuttx-39d69550a195f226b1985ebc62f760d286cd68c8.tar.gz nuttx-39d69550a195f226b1985ebc62f760d286cd68c8.tar.bz2 nuttx-39d69550a195f226b1985ebc62f760d286cd68c8.zip |
The old lm/ directories were enamed tiva/ to better support new products coming down the pipe from TI
Diffstat (limited to 'nuttx/arch/arm/src')
-rw-r--r-- | nuttx/arch/arm/src/tiva/Kconfig (renamed from nuttx/arch/arm/src/lm/Kconfig) | 37 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/Make.defs (renamed from nuttx/arch/arm/src/lm/Make.defs) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip.h (renamed from nuttx/arch/arm/src/lm/chip.h) | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm3s_memorymap.h (renamed from nuttx/arch/arm/src/lm/chip/lm3s_memorymap.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm3s_pinmap.h (renamed from nuttx/arch/arm/src/lm/chip/lm3s_pinmap.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm3s_syscontrol.h (renamed from nuttx/arch/arm/src/lm/chip/lm3s_syscontrol.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm3s_vectors.h (renamed from nuttx/arch/arm/src/lm/chip/lm3s_vectors.h) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm4f_memorymap.h (renamed from nuttx/arch/arm/src/lm/chip/lm4f_memorymap.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm4f_pinmap.h (renamed from nuttx/arch/arm/src/lm/chip/lm4f_pinmap.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm4f_syscontrol.h (renamed from nuttx/arch/arm/src/lm/chip/lm4f_syscontrol.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm4f_vectors.h (renamed from nuttx/arch/arm/src/lm/chip/lm4f_vectors.h) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_epi.h (renamed from nuttx/arch/arm/src/lm/chip/lm_epi.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_ethernet.h (renamed from nuttx/arch/arm/src/lm/chip/lm_ethernet.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_flash.h (renamed from nuttx/arch/arm/src/lm/chip/lm_flash.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_gpio.h (renamed from nuttx/arch/arm/src/lm/chip/lm_gpio.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_i2c.h (renamed from nuttx/arch/arm/src/lm/chip/lm_i2c.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_memorymap.h (renamed from nuttx/arch/arm/src/lm/chip/lm_memorymap.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_pinmap.h (renamed from nuttx/arch/arm/src/lm/chip/lm_pinmap.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_ssi.h (renamed from nuttx/arch/arm/src/lm/chip/lm_ssi.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_syscontrol.h (renamed from nuttx/arch/arm/src/lm/chip/lm_syscontrol.h) | 10 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_timer.h (renamed from nuttx/arch/arm/src/lm/chip/lm_timer.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_uart.h (renamed from nuttx/arch/arm/src/lm/chip/lm_uart.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/chip/lm_vectors.h (renamed from nuttx/arch/arm/src/lm/chip/lm_vectors.h) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_allocateheap.c (renamed from nuttx/arch/arm/src/lm/lm_allocateheap.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_dumpgpio.c (renamed from nuttx/arch/arm/src/lm/lm_dumpgpio.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_ethernet.c (renamed from nuttx/arch/arm/src/lm/lm_ethernet.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_ethernet.h (renamed from nuttx/arch/arm/src/lm/lm_ethernet.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_flash.c (renamed from nuttx/arch/arm/src/lm/lm_flash.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_gpio.c (renamed from nuttx/arch/arm/src/lm/lm_gpio.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_gpio.h (renamed from nuttx/arch/arm/src/lm/lm_gpio.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_gpioirq.c (renamed from nuttx/arch/arm/src/lm/lm_gpioirq.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_irq.c (renamed from nuttx/arch/arm/src/lm/lm_irq.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_lowputc.c (renamed from nuttx/arch/arm/src/lm/lm_lowputc.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_lowputc.h (renamed from nuttx/arch/arm/src/lm/lm_lowputc.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_mpuinit.c (renamed from nuttx/arch/arm/src/lm/lm_mpuinit.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_mpuinit.h (renamed from nuttx/arch/arm/src/lm/lm_mpuinit.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_serial.c (renamed from nuttx/arch/arm/src/lm/lm_serial.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_ssi.c (renamed from nuttx/arch/arm/src/lm/lm_ssi.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_ssi.h (renamed from nuttx/arch/arm/src/lm/lm_ssi.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_start.c (renamed from nuttx/arch/arm/src/lm/lm_start.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_syscontrol.c (renamed from nuttx/arch/arm/src/lm/lm_syscontrol.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_syscontrol.h (renamed from nuttx/arch/arm/src/lm/lm_syscontrol.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_timerisr.c (renamed from nuttx/arch/arm/src/lm/lm_timerisr.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_userspace.c (renamed from nuttx/arch/arm/src/lm/lm_userspace.c) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_userspace.h (renamed from nuttx/arch/arm/src/lm/lm_userspace.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/src/tiva/lm_vectors.S (renamed from nuttx/arch/arm/src/lm/lm_vectors.S) | 2 |
46 files changed, 145 insertions, 136 deletions
diff --git a/nuttx/arch/arm/src/lm/Kconfig b/nuttx/arch/arm/src/tiva/Kconfig index 84f326fd9..ef2b827f8 100644 --- a/nuttx/arch/arm/src/lm/Kconfig +++ b/nuttx/arch/arm/src/tiva/Kconfig @@ -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" diff --git a/nuttx/arch/arm/src/lm/Make.defs b/nuttx/arch/arm/src/tiva/Make.defs index 141b5003a..46ea36e25 100644 --- a/nuttx/arch/arm/src/lm/Make.defs +++ b/nuttx/arch/arm/src/tiva/Make.defs @@ -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> diff --git a/nuttx/arch/arm/src/lm/chip.h b/nuttx/arch/arm/src/tiva/chip.h index e476ce435..a6016bc0d 100644 --- a/nuttx/arch/arm/src/lm/chip.h +++ b/nuttx/arch/arm/src/tiva/chip.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm3s_memorymap.h b/nuttx/arch/arm/src/tiva/chip/lm3s_memorymap.h index d4bae8358..14ba1d42d 100644 --- a/nuttx/arch/arm/src/lm/chip/lm3s_memorymap.h +++ b/nuttx/arch/arm/src/tiva/chip/lm3s_memorymap.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm3s_pinmap.h b/nuttx/arch/arm/src/tiva/chip/lm3s_pinmap.h index ca1d53064..534d62063 100644 --- a/nuttx/arch/arm/src/lm/chip/lm3s_pinmap.h +++ b/nuttx/arch/arm/src/tiva/chip/lm3s_pinmap.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm3s_syscontrol.h b/nuttx/arch/arm/src/tiva/chip/lm3s_syscontrol.h index a8e216778..544e63d18 100644 --- a/nuttx/arch/arm/src/lm/chip/lm3s_syscontrol.h +++ b/nuttx/arch/arm/src/tiva/chip/lm3s_syscontrol.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm3s_vectors.h b/nuttx/arch/arm/src/tiva/chip/lm3s_vectors.h index 58447793d..2c723b631 100644 --- a/nuttx/arch/arm/src/lm/chip/lm3s_vectors.h +++ b/nuttx/arch/arm/src/tiva/chip/lm3s_vectors.h @@ -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> diff --git a/nuttx/arch/arm/src/lm/chip/lm4f_memorymap.h b/nuttx/arch/arm/src/tiva/chip/lm4f_memorymap.h index 4d715e470..76e8283a3 100644 --- a/nuttx/arch/arm/src/lm/chip/lm4f_memorymap.h +++ b/nuttx/arch/arm/src/tiva/chip/lm4f_memorymap.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm4f_pinmap.h b/nuttx/arch/arm/src/tiva/chip/lm4f_pinmap.h index 6f4bc27a6..91c58bd2d 100644 --- a/nuttx/arch/arm/src/lm/chip/lm4f_pinmap.h +++ b/nuttx/arch/arm/src/tiva/chip/lm4f_pinmap.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm4f_syscontrol.h b/nuttx/arch/arm/src/tiva/chip/lm4f_syscontrol.h index cc7659f29..a9c6d483a 100644 --- a/nuttx/arch/arm/src/lm/chip/lm4f_syscontrol.h +++ b/nuttx/arch/arm/src/tiva/chip/lm4f_syscontrol.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm4f_vectors.h b/nuttx/arch/arm/src/tiva/chip/lm4f_vectors.h index c8e69377b..1918f9c6d 100644 --- a/nuttx/arch/arm/src/lm/chip/lm4f_vectors.h +++ b/nuttx/arch/arm/src/tiva/chip/lm4f_vectors.h @@ -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> diff --git a/nuttx/arch/arm/src/lm/chip/lm_epi.h b/nuttx/arch/arm/src/tiva/chip/lm_epi.h index 47d790615..317ea8ea6 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_epi.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_epi.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm_ethernet.h b/nuttx/arch/arm/src/tiva/chip/lm_ethernet.h index 02908d222..e05c4a198 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_ethernet.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_ethernet.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm_flash.h b/nuttx/arch/arm/src/tiva/chip/lm_flash.h index 45b5154bb..a6ae15c36 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_flash.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_flash.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm_gpio.h b/nuttx/arch/arm/src/tiva/chip/lm_gpio.h index 3fdf5086f..b8ef66756 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_gpio.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_gpio.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm_i2c.h b/nuttx/arch/arm/src/tiva/chip/lm_i2c.h index 88ce31b77..3b0f3c898 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_i2c.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_i2c.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm_memorymap.h b/nuttx/arch/arm/src/tiva/chip/lm_memorymap.h index d8257fc02..076447e70 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_memorymap.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_memorymap.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm_pinmap.h b/nuttx/arch/arm/src/tiva/chip/lm_pinmap.h index 00b42e73b..0efaa19ae 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_pinmap.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_pinmap.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm_ssi.h b/nuttx/arch/arm/src/tiva/chip/lm_ssi.h index 5243bf112..90fbd750a 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_ssi.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_ssi.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm_syscontrol.h b/nuttx/arch/arm/src/tiva/chip/lm_syscontrol.h index 008fa2d34..bf50c5214 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_syscontrol.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_syscontrol.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm_timer.h b/nuttx/arch/arm/src/tiva/chip/lm_timer.h index 5ed68f13a..b3fd06c7b 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_timer.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_timer.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm_uart.h b/nuttx/arch/arm/src/tiva/chip/lm_uart.h index 2ad065294..f32a0a166 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_uart.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_uart.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/chip/lm_vectors.h b/nuttx/arch/arm/src/tiva/chip/lm_vectors.h index 97227bf29..34ea2cae8 100644 --- a/nuttx/arch/arm/src/lm/chip/lm_vectors.h +++ b/nuttx/arch/arm/src/tiva/chip/lm_vectors.h @@ -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> diff --git a/nuttx/arch/arm/src/lm/lm_allocateheap.c b/nuttx/arch/arm/src/tiva/lm_allocateheap.c index 08a000dd6..bb2271e7d 100644 --- a/nuttx/arch/arm/src/lm/lm_allocateheap.c +++ b/nuttx/arch/arm/src/tiva/lm_allocateheap.c @@ -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> diff --git a/nuttx/arch/arm/src/lm/lm_dumpgpio.c b/nuttx/arch/arm/src/tiva/lm_dumpgpio.c index d1202efa4..837321478 100644 --- a/nuttx/arch/arm/src/lm/lm_dumpgpio.c +++ b/nuttx/arch/arm/src/tiva/lm_dumpgpio.c @@ -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> diff --git a/nuttx/arch/arm/src/lm/lm_ethernet.c b/nuttx/arch/arm/src/tiva/lm_ethernet.c index 88cc164a7..c3cd02ab5 100644 --- a/nuttx/arch/arm/src/lm/lm_ethernet.c +++ b/nuttx/arch/arm/src/tiva/lm_ethernet.c @@ -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> diff --git a/nuttx/arch/arm/src/lm/lm_ethernet.h b/nuttx/arch/arm/src/tiva/lm_ethernet.h index e3cc65067..5ffa3b59d 100644 --- a/nuttx/arch/arm/src/lm/lm_ethernet.h +++ b/nuttx/arch/arm/src/tiva/lm_ethernet.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/lm_flash.c b/nuttx/arch/arm/src/tiva/lm_flash.c index 1a5490525..1d573103e 100644 --- a/nuttx/arch/arm/src/lm/lm_flash.c +++ b/nuttx/arch/arm/src/tiva/lm_flash.c @@ -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. diff --git a/nuttx/arch/arm/src/lm/lm_gpio.c b/nuttx/arch/arm/src/tiva/lm_gpio.c index 6607966a2..af1eeacb1 100644 --- a/nuttx/arch/arm/src/lm/lm_gpio.c +++ b/nuttx/arch/arm/src/tiva/lm_gpio.c @@ -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. diff --git a/nuttx/arch/arm/src/lm/lm_gpio.h b/nuttx/arch/arm/src/tiva/lm_gpio.h index a8206c109..6531b2a28 100644 --- a/nuttx/arch/arm/src/lm/lm_gpio.h +++ b/nuttx/arch/arm/src/tiva/lm_gpio.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/lm_gpioirq.c b/nuttx/arch/arm/src/tiva/lm_gpioirq.c index 8c0da4855..ccf689cd5 100644 --- a/nuttx/arch/arm/src/lm/lm_gpioirq.c +++ b/nuttx/arch/arm/src/tiva/lm_gpioirq.c @@ -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. diff --git a/nuttx/arch/arm/src/lm/lm_irq.c b/nuttx/arch/arm/src/tiva/lm_irq.c index 6ada4d3e9..182963960 100644 --- a/nuttx/arch/arm/src/lm/lm_irq.c +++ b/nuttx/arch/arm/src/tiva/lm_irq.c @@ -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. diff --git a/nuttx/arch/arm/src/lm/lm_lowputc.c b/nuttx/arch/arm/src/tiva/lm_lowputc.c index 6bb803314..e2e26d4a1 100644 --- a/nuttx/arch/arm/src/lm/lm_lowputc.c +++ b/nuttx/arch/arm/src/tiva/lm_lowputc.c @@ -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> diff --git a/nuttx/arch/arm/src/lm/lm_lowputc.h b/nuttx/arch/arm/src/tiva/lm_lowputc.h index cc9a5d0ca..96ed97ebb 100644 --- a/nuttx/arch/arm/src/lm/lm_lowputc.h +++ b/nuttx/arch/arm/src/tiva/lm_lowputc.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/lm_mpuinit.c b/nuttx/arch/arm/src/tiva/lm_mpuinit.c index db06de1c1..8e4b2e372 100644 --- a/nuttx/arch/arm/src/lm/lm_mpuinit.c +++ b/nuttx/arch/arm/src/tiva/lm_mpuinit.c @@ -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> diff --git a/nuttx/arch/arm/src/lm/lm_mpuinit.h b/nuttx/arch/arm/src/tiva/lm_mpuinit.h index 3c9a06c21..763b5003e 100644 --- a/nuttx/arch/arm/src/lm/lm_mpuinit.h +++ b/nuttx/arch/arm/src/tiva/lm_mpuinit.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/lm_serial.c b/nuttx/arch/arm/src/tiva/lm_serial.c index 61999d45a..86532854e 100644 --- a/nuttx/arch/arm/src/lm/lm_serial.c +++ b/nuttx/arch/arm/src/tiva/lm_serial.c @@ -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> diff --git a/nuttx/arch/arm/src/lm/lm_ssi.c b/nuttx/arch/arm/src/tiva/lm_ssi.c index d6769e2da..3e4aa30f9 100644 --- a/nuttx/arch/arm/src/lm/lm_ssi.c +++ b/nuttx/arch/arm/src/tiva/lm_ssi.c @@ -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> diff --git a/nuttx/arch/arm/src/lm/lm_ssi.h b/nuttx/arch/arm/src/tiva/lm_ssi.h index f1c7be155..7ce0e46c0 100644 --- a/nuttx/arch/arm/src/lm/lm_ssi.h +++ b/nuttx/arch/arm/src/tiva/lm_ssi.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/lm_start.c b/nuttx/arch/arm/src/tiva/lm_start.c index 184170dbf..726a08148 100644 --- a/nuttx/arch/arm/src/lm/lm_start.c +++ b/nuttx/arch/arm/src/tiva/lm_start.c @@ -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. diff --git a/nuttx/arch/arm/src/lm/lm_syscontrol.c b/nuttx/arch/arm/src/tiva/lm_syscontrol.c index b4210c44a..c72e8580c 100644 --- a/nuttx/arch/arm/src/lm/lm_syscontrol.c +++ b/nuttx/arch/arm/src/tiva/lm_syscontrol.c @@ -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. diff --git a/nuttx/arch/arm/src/lm/lm_syscontrol.h b/nuttx/arch/arm/src/tiva/lm_syscontrol.h index 98fbc81cb..9a11875b9 100644 --- a/nuttx/arch/arm/src/lm/lm_syscontrol.h +++ b/nuttx/arch/arm/src/tiva/lm_syscontrol.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/lm_timerisr.c b/nuttx/arch/arm/src/tiva/lm_timerisr.c index 49e11e5c5..0a3ea27de 100644 --- a/nuttx/arch/arm/src/lm/lm_timerisr.c +++ b/nuttx/arch/arm/src/tiva/lm_timerisr.c @@ -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> diff --git a/nuttx/arch/arm/src/lm/lm_userspace.c b/nuttx/arch/arm/src/tiva/lm_userspace.c index f198f5c2f..9bd3ffbf7 100644 --- a/nuttx/arch/arm/src/lm/lm_userspace.c +++ b/nuttx/arch/arm/src/tiva/lm_userspace.c @@ -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> diff --git a/nuttx/arch/arm/src/lm/lm_userspace.h b/nuttx/arch/arm/src/tiva/lm_userspace.h index 37c0aff31..b4197f64e 100644 --- a/nuttx/arch/arm/src/lm/lm_userspace.h +++ b/nuttx/arch/arm/src/tiva/lm_userspace.h @@ -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 */ diff --git a/nuttx/arch/arm/src/lm/lm_vectors.S b/nuttx/arch/arm/src/tiva/lm_vectors.S index ede558ec7..6e3f8a058 100644 --- a/nuttx/arch/arm/src/lm/lm_vectors.S +++ b/nuttx/arch/arm/src/tiva/lm_vectors.S @@ -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. |