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 | |
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
-rw-r--r-- | nuttx/ChangeLog | 5 | ||||
-rw-r--r-- | nuttx/arch/arm/Kconfig | 19 | ||||
-rw-r--r-- | nuttx/arch/arm/include/tiva/chip.h (renamed from nuttx/arch/arm/include/lm/chip.h) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/include/tiva/irq.h (renamed from nuttx/arch/arm/include/lm/irq.h) | 8 | ||||
-rw-r--r-- | nuttx/arch/arm/include/tiva/lm3s_irq.h (renamed from nuttx/arch/arm/include/lm/lm3s_irq.h) | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/include/tiva/lm4f_irq.h (renamed from nuttx/arch/arm/include/lm/lm4f_irq.h) | 2 | ||||
-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 | ||||
-rw-r--r-- | nuttx/configs/eagle100/httpd/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/eagle100/nettest/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/eagle100/nsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/eagle100/nxflat/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/eagle100/thttpd/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/ekk-lm3s9b96/nsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/lm3s6432-s2e/nsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/lm3s6965-ek/discover/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/lm3s6965-ek/nsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/lm3s6965-ek/nx/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/lm3s6965-ek/tcpecho/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/lm3s8962-ek/nsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/lm3s8962-ek/nx/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/lm4f120-launchpad/nsh/defconfig | 206 | ||||
-rwxr-xr-x | nuttx/configs/lm4f120-launchpad/nsh/setenv.sh | 1 |
67 files changed, 367 insertions, 185 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 05021d259..5e5b20b6e 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6956,4 +6956,7 @@ * configs/olimex-lpc2378/src: Files renamed to correspond with current thinking about naming (2014-3-8). * arch/arm/src/lpc2378/lpc23xx_i2c.c and lpc23xx_spi.c: I2C and SPI - drivers for the LPC23xx from Lizhuoyi (2014-3-8).
\ No newline at end of file + drivers for the LPC23xx from Lizhuoyi (2014-3-8). + * arch/arm/include/tiva and src/tiva: The old lm/ directories were + renamed tiva/ to better support new products coming down the pipe + from TI (2014-3-8). diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig index 3678e5c63..87242b2af 100644 --- a/nuttx/arch/arm/Kconfig +++ b/nuttx/arch/arm/Kconfig @@ -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/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 Stellaris LMS3 and LM4F architectures (ARM Cortex-M3/4) + 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 diff --git a/nuttx/arch/arm/include/lm/chip.h b/nuttx/arch/arm/include/tiva/chip.h index 53ca4d9f0..d3f043735 100644 --- a/nuttx/arch/arm/include/lm/chip.h +++ b/nuttx/arch/arm/include/tiva/chip.h @@ -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> diff --git a/nuttx/arch/arm/include/lm/irq.h b/nuttx/arch/arm/include/tiva/irq.h index 51e362da5..21daa4fa7 100644 --- a/nuttx/arch/arm/include/lm/irq.h +++ b/nuttx/arch/arm/include/tiva/irq.h @@ -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 diff --git a/nuttx/arch/arm/include/lm/lm3s_irq.h b/nuttx/arch/arm/include/tiva/lm3s_irq.h index 04b6d9a12..5f4f1cc9c 100644 --- a/nuttx/arch/arm/include/lm/lm3s_irq.h +++ b/nuttx/arch/arm/include/tiva/lm3s_irq.h @@ -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> diff --git a/nuttx/arch/arm/include/lm/lm4f_irq.h b/nuttx/arch/arm/include/tiva/lm4f_irq.h index f00cf8aad..11cd30c9b 100644 --- a/nuttx/arch/arm/include/lm/lm4f_irq.h +++ b/nuttx/arch/arm/include/tiva/lm4f_irq.h @@ -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> 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. diff --git a/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig index 7e7ff7a9a..4c951c251 100644 --- a/nuttx/configs/eagle100/httpd/defconfig +++ b/nuttx/configs/eagle100/httpd/defconfig @@ -98,7 +98,7 @@ CONFIG_ARCH_CORTEXM3=y # CONFIG_ARCH_CORTEXA5 is not set # CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set CONFIG_ARCH_HAVE_CMNVECTOR=y # CONFIG_ARMV7M_CMNVECTOR is not set diff --git a/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig index 243aa63a2..1b872a449 100644 --- a/nuttx/configs/eagle100/nettest/defconfig +++ b/nuttx/configs/eagle100/nettest/defconfig @@ -120,7 +120,7 @@ CONFIG_ARCH_CORTEXM3=y # CONFIG_ARCH_CORTEXA5 is not set # CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set CONFIG_ARCH_HAVE_CMNVECTOR=y # CONFIG_ARMV7M_CMNVECTOR is not set diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig index 24f94cdd2..1eb615477 100644 --- a/nuttx/configs/eagle100/nsh/defconfig +++ b/nuttx/configs/eagle100/nsh/defconfig @@ -98,7 +98,7 @@ CONFIG_ARCH_CORTEXM3=y # CONFIG_ARCH_CORTEXA5 is not set # CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set CONFIG_ARCH_HAVE_CMNVECTOR=y # CONFIG_ARMV7M_CMNVECTOR is not set diff --git a/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig index 484f982b4..20be1254c 100644 --- a/nuttx/configs/eagle100/nxflat/defconfig +++ b/nuttx/configs/eagle100/nxflat/defconfig @@ -98,7 +98,7 @@ CONFIG_ARCH_CORTEXM3=y # CONFIG_ARCH_CORTEXA5 is not set # CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set CONFIG_ARCH_HAVE_CMNVECTOR=y # CONFIG_ARMV7M_CMNVECTOR is not set diff --git a/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig index ee9fa6ede..05334eb30 100644 --- a/nuttx/configs/eagle100/thttpd/defconfig +++ b/nuttx/configs/eagle100/thttpd/defconfig @@ -94,7 +94,7 @@ CONFIG_ARCH_CORTEXM3=y # CONFIG_ARCH_CORTEXA5 is not set # CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set CONFIG_ARCH_HAVE_CMNVECTOR=y # CONFIG_ARMV7M_CMNVECTOR is not set diff --git a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig index bab2920a6..28f8338ba 100644 --- a/nuttx/configs/ekk-lm3s9b96/nsh/defconfig +++ b/nuttx/configs/ekk-lm3s9b96/nsh/defconfig @@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_LM=y # CONFIG_ARCH_CHIP_STR71X is not set CONFIG_ARCH_CORTEXM3=y CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set # CONFIG_ARCH_HAVE_MPU is not set # CONFIG_ARMV7M_MPU is not set diff --git a/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig index c1cdbc9e8..f8b333677 100644 --- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig +++ b/nuttx/configs/lm3s6432-s2e/nsh/defconfig @@ -94,7 +94,7 @@ CONFIG_ARCH_CORTEXM3=y # CONFIG_ARCH_CORTEXA5 is not set # CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set # CONFIG_ARCH_HAVE_FPU is not set # CONFIG_ARCH_HAVE_MPU is not set diff --git a/nuttx/configs/lm3s6965-ek/discover/defconfig b/nuttx/configs/lm3s6965-ek/discover/defconfig index 47a389fc0..acea959bf 100644 --- a/nuttx/configs/lm3s6965-ek/discover/defconfig +++ b/nuttx/configs/lm3s6965-ek/discover/defconfig @@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_LM3S=y # CONFIG_ARCH_CHIP_STR71X is not set CONFIG_ARCH_CORTEXM3=y CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARCH_HAVE_MPU is not set # CONFIG_ARMV7M_MPU is not set CONFIG_BOARD_LOOPSPERMSEC=4531 diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig index 47a389fc0..acea959bf 100644 --- a/nuttx/configs/lm3s6965-ek/nsh/defconfig +++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig @@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_LM3S=y # CONFIG_ARCH_CHIP_STR71X is not set CONFIG_ARCH_CORTEXM3=y CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARCH_HAVE_MPU is not set # CONFIG_ARMV7M_MPU is not set CONFIG_BOARD_LOOPSPERMSEC=4531 diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig index 36f198f88..216683df0 100644 --- a/nuttx/configs/lm3s6965-ek/nx/defconfig +++ b/nuttx/configs/lm3s6965-ek/nx/defconfig @@ -76,7 +76,7 @@ CONFIG_ARCH_CHIP_LM3S=y # CONFIG_ARCH_CHIP_STR71X is not set CONFIG_ARCH_CORTEXM3=y CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARCH_HAVE_MPU is not set # CONFIG_ARMV7M_MPU is not set CONFIG_BOARD_LOOPSPERMSEC=4531 diff --git a/nuttx/configs/lm3s6965-ek/tcpecho/defconfig b/nuttx/configs/lm3s6965-ek/tcpecho/defconfig index b4c2c2000..a59251a3e 100644 --- a/nuttx/configs/lm3s6965-ek/tcpecho/defconfig +++ b/nuttx/configs/lm3s6965-ek/tcpecho/defconfig @@ -97,7 +97,7 @@ CONFIG_ARCH_CHIP_LM=y # CONFIG_ARCH_CHIP_STR71X is not set CONFIG_ARCH_CORTEXM3=y CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set # CONFIG_ARCH_HAVE_MPU is not set # CONFIG_ARMV7M_MPU is not set diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig index 811d66f5e..5e50cb404 100644 --- a/nuttx/configs/lm3s8962-ek/nsh/defconfig +++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig @@ -98,7 +98,7 @@ CONFIG_ARCH_CORTEXM3=y # CONFIG_ARCH_CORTEXA5 is not set # CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set CONFIG_ARCH_HAVE_CMNVECTOR=y # CONFIG_ARMV7M_CMNVECTOR is not set diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig index 1c75d2b04..d37e4aa9d 100644 --- a/nuttx/configs/lm3s8962-ek/nx/defconfig +++ b/nuttx/configs/lm3s8962-ek/nx/defconfig @@ -98,7 +98,7 @@ CONFIG_ARCH_CORTEXM3=y # CONFIG_ARCH_CORTEXA5 is not set # CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set CONFIG_ARCH_HAVE_CMNVECTOR=y # CONFIG_ARMV7M_CMNVECTOR is not set diff --git a/nuttx/configs/lm4f120-launchpad/nsh/defconfig b/nuttx/configs/lm4f120-launchpad/nsh/defconfig index 7efd4e7ee..309ce5cb3 100644 --- a/nuttx/configs/lm4f120-launchpad/nsh/defconfig +++ b/nuttx/configs/lm4f120-launchpad/nsh/defconfig @@ -7,6 +7,7 @@ # Build Setup # # CONFIG_EXPERIMENTAL is not set +# CONFIG_DEFAULT_SMALL is not set CONFIG_HOST_LINUX=y # CONFIG_HOST_OSX is not set # CONFIG_HOST_WINDOWS is not set @@ -29,6 +30,7 @@ CONFIG_RAW_BINARY=y # # Customize Header Files # +# CONFIG_ARCH_STDINT_H is not set # CONFIG_ARCH_STDBOOL_H is not set # CONFIG_ARCH_MATH_H is not set # CONFIG_ARCH_FLOAT_H is not set @@ -38,7 +40,13 @@ CONFIG_RAW_BINARY=y # Debug Options # # CONFIG_DEBUG is not set +CONFIG_ARCH_HAVE_STACKCHECK=y +# CONFIG_ARCH_HAVE_HEAPCHECK is not set # CONFIG_DEBUG_SYMBOLS is not set +CONFIG_ARCH_HAVE_CUSTOMOPT=y +# CONFIG_DEBUG_NOOPT is not set +# CONFIG_DEBUG_CUSTOMOPT is not set +CONFIG_DEBUG_FULLOPT=y # # System Type @@ -59,25 +67,40 @@ CONFIG_ARCH="arm" # # ARM Options # +# CONFIG_ARCH_CHIP_A1X is not set # CONFIG_ARCH_CHIP_C5471 is not set # CONFIG_ARCH_CHIP_CALYPSO is not set # CONFIG_ARCH_CHIP_DM320 is not set # CONFIG_ARCH_CHIP_IMX is not set # CONFIG_ARCH_CHIP_KINETIS is not set +# CONFIG_ARCH_CHIP_KL is not set CONFIG_ARCH_CHIP_LM=y +# CONFIG_ARCH_CHIP_TIVA is not set # CONFIG_ARCH_CHIP_LPC17XX is not set # CONFIG_ARCH_CHIP_LPC214X is not set # CONFIG_ARCH_CHIP_LPC2378 is not set # CONFIG_ARCH_CHIP_LPC31XX is not set # CONFIG_ARCH_CHIP_LPC43XX is not set # CONFIG_ARCH_CHIP_NUC1XX is not set -# CONFIG_ARCH_CHIP_SAM3U is not set +# CONFIG_ARCH_CHIP_SAMA5 is not set +# CONFIG_ARCH_CHIP_SAMD is not set +# CONFIG_ARCH_CHIP_SAM34 is not set # CONFIG_ARCH_CHIP_STM32 is not set # CONFIG_ARCH_CHIP_STR71X is not set +# CONFIG_ARCH_ARM7TDMI is not set +# CONFIG_ARCH_ARM926EJS is not set +# CONFIG_ARCH_ARM920T is not set +# CONFIG_ARCH_CORTEXM0 is not set +# CONFIG_ARCH_CORTEXM3 is not set CONFIG_ARCH_CORTEXM4=y +# CONFIG_ARCH_CORTEXA5 is not set +# CONFIG_ARCH_CORTEXA8 is not set CONFIG_ARCH_FAMILY="armv7-m" -CONFIG_ARCH_CHIP="lm" +CONFIG_ARCH_CHIP="tiva" # CONFIG_ARMV7M_USEBASEPRI is not set +CONFIG_ARCH_HAVE_CMNVECTOR=y +# CONFIG_ARMV7M_CMNVECTOR is not set +CONFIG_ARCH_HAVE_FPU=y # CONFIG_ARCH_FPU is not set CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARMV7M_MPU is not set @@ -92,7 +115,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y CONFIG_ARMV7M_OABI_TOOLCHAIN=y # -# Stellaris Configuration Options +# Tiva/Stellaris Configuration Options # # CONFIG_ARCH_CHIP_LM3S6918 is not set # CONFIG_ARCH_CHIP_LM3S9B96 is not set @@ -104,14 +127,20 @@ CONFIG_ARCH_CHIP_LM4F=y # CONFIG_LM_REVA2 is not set # -# Stellaris Peripheral Support +# Tiva/Stellaris Peripheral Support # CONFIG_LM_UART0=y # CONFIG_LM_UART1 is not set +# CONFIG_LM_UART2 is not set +# CONFIG_LM_UART3 is not set +# CONFIG_LM_UART4 is not set +# CONFIG_LM_UART5 is not set +# CONFIG_LM_UART6 is not set +# CONFIG_LM_UART7 is not set # CONFIG_SSI0_DISABLE is not set CONFIG_SSI1_DISABLE=y -# CONFIG_LM_UART2 is not set # CONFIG_LM_ETHERNET is not set +# CONFIG_LM_FLASH is not set # # Disable GPIO Interrupts @@ -127,27 +156,27 @@ CONFIG_LM_DISABLE_GPIOH_IRQS=y CONFIG_LM_DISABLE_GPIOJ_IRQS=y # -# Stellaris SSI Configuration +# Tiva/Stellaris SSI Configuration # CONFIG_SSI_POLLWAIT=y CONFIG_SSI_TXLIMIT=4 # -# External Memory Configuration -# - -# # Architecture Options # # CONFIG_ARCH_NOINTC is not set # CONFIG_ARCH_VECNOTIRQ is not set # CONFIG_ARCH_DMA is not set -CONFIG_ARCH_IRQPRIO=y +CONFIG_ARCH_HAVE_IRQPRIO=y # CONFIG_CUSTOM_STACK is not set # CONFIG_ADDRENV is not set CONFIG_ARCH_HAVE_VFORK=y +# CONFIG_ARCH_HAVE_MMU is not set +# CONFIG_ARCH_NAND_HWECC is not set +CONFIG_ARCH_IRQPRIO=y CONFIG_ARCH_STACKDUMP=y # CONFIG_ENDIAN_BIG is not set +# CONFIG_ARCH_IDLE_CUSTOM is not set # CONFIG_ARCH_HAVE_RAMFUNCS is not set CONFIG_ARCH_HAVE_RAMVECTORS=y # CONFIG_ARCH_RAMVECTORS is not set @@ -157,10 +186,14 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y # CONFIG_BOARD_LOOPSPERMSEC=4531 # CONFIG_ARCH_CALIBRATION is not set -CONFIG_RAM_START=0x20000000 -CONFIG_RAM_SIZE=32768 + +# +# Interrupt options +# CONFIG_ARCH_HAVE_INTERRUPTSTACK=y CONFIG_ARCH_INTERRUPTSTACK=0 +CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y +# CONFIG_ARCH_HIPRI_INTERRUPT is not set # # Boot options @@ -172,6 +205,13 @@ CONFIG_BOOT_RUNFROMFLASH=y # CONFIG_BOOT_COPYTORAM is not set # +# Boot Memory Configuration +# +CONFIG_RAM_START=0x20000000 +CONFIG_RAM_SIZE=32768 +# CONFIG_ARCH_HAVE_SDRAM is not set + +# # Board Selection # CONFIG_ARCH_BOARD_LM4F120_LAUNCHPAD=y @@ -197,7 +237,9 @@ CONFIG_NSH_MMCSDMINOR=0 # # CONFIG_BOARD_INITIALIZE is not set CONFIG_MSEC_PER_TICK=10 +# CONFIG_SYSTEM_TIME64 is not set CONFIG_RR_INTERVAL=200 +# CONFIG_SCHED_CPULOAD is not set # CONFIG_SCHED_INSTRUMENTATION is not set CONFIG_TASK_NAME_SIZE=0 # CONFIG_SCHED_HAVE_PARENT is not set @@ -264,12 +306,17 @@ CONFIG_DEV_NULL=y # CONFIG_LOOP is not set # CONFIG_RAMDISK is not set # CONFIG_CAN is not set +# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set # CONFIG_PWM is not set +# CONFIG_ARCH_HAVE_I2CRESET is not set # CONFIG_I2C is not set # CONFIG_SPI is not set +# CONFIG_I2S is not set # CONFIG_RTC is not set # CONFIG_WATCHDOG is not set # CONFIG_ANALOG is not set +# CONFIG_AUDIO_DEVICES is not set +# CONFIG_VIDEO_DEVICES is not set # CONFIG_BCH is not set # CONFIG_INPUT is not set # CONFIG_LCD is not set @@ -283,7 +330,31 @@ CONFIG_DEV_NULL=y CONFIG_SERIAL=y # CONFIG_DEV_LOWCONSOLE is not set # CONFIG_16550_UART is not set +# CONFIG_ARCH_HAVE_UART is not set CONFIG_ARCH_HAVE_UART0=y +# CONFIG_ARCH_HAVE_UART1 is not set +# CONFIG_ARCH_HAVE_UART2 is not set +# CONFIG_ARCH_HAVE_UART3 is not set +# CONFIG_ARCH_HAVE_UART4 is not set +# CONFIG_ARCH_HAVE_UART5 is not set +# CONFIG_ARCH_HAVE_UART6 is not set +# CONFIG_ARCH_HAVE_UART7 is not set +# CONFIG_ARCH_HAVE_UART8 is not set +# CONFIG_ARCH_HAVE_SCI0 is not set +# CONFIG_ARCH_HAVE_SCI1 is not set +# CONFIG_ARCH_HAVE_USART0 is not set +# CONFIG_ARCH_HAVE_USART1 is not set +# CONFIG_ARCH_HAVE_USART2 is not set +# CONFIG_ARCH_HAVE_USART3 is not set +# CONFIG_ARCH_HAVE_USART4 is not set +# CONFIG_ARCH_HAVE_USART5 is not set +# CONFIG_ARCH_HAVE_USART6 is not set +# CONFIG_ARCH_HAVE_USART7 is not set +# CONFIG_ARCH_HAVE_USART8 is not set + +# +# USART Configuration +# CONFIG_MCU_SERIAL=y CONFIG_STANDARD_SERIAL=y CONFIG_UART0_SERIAL_CONSOLE=y @@ -298,6 +369,10 @@ CONFIG_UART0_BAUD=115200 CONFIG_UART0_BITS=8 CONFIG_UART0_PARITY=0 CONFIG_UART0_2STOP=0 +# CONFIG_UART0_IFLOWCONTROL is not set +# CONFIG_UART0_OFLOWCONTROL is not set +# CONFIG_SERIAL_IFLOWCONTROL is not set +# CONFIG_SERIAL_OFLOWCONTROL is not set # CONFIG_USBDEV is not set # CONFIG_USBHOST is not set # CONFIG_WIRELESS is not set @@ -314,6 +389,8 @@ CONFIG_UART0_2STOP=0 # # Networking Support # +# CONFIG_ARCH_HAVE_NET is not set +# CONFIG_ARCH_HAVE_PHY is not set # CONFIG_NET is not set # @@ -324,11 +401,16 @@ CONFIG_UART0_2STOP=0 # File system configuration # # CONFIG_DISABLE_MOUNTPOINT is not set +# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set +# CONFIG_FS_READABLE is not set +# CONFIG_FS_WRITABLE is not set # CONFIG_FS_RAMMAP is not set # CONFIG_FS_FAT is not set # CONFIG_FS_NXFFS is not set # CONFIG_FS_ROMFS is not set +# CONFIG_FS_SMARTFS is not set # CONFIG_FS_BINFS is not set +# CONFIG_FS_PROCFS is not set # # System Logging @@ -347,9 +429,15 @@ CONFIG_UART0_2STOP=0 # CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 +# CONFIG_ARCH_HAVE_HEAP2 is not set # CONFIG_GRAN is not set # +# Audio Support +# +# CONFIG_AUDIO is not set + +# # Binary Formats # # CONFIG_BINFMT_DISABLE is not set @@ -374,6 +462,7 @@ CONFIG_LIB_HOMEDIR="/" # CONFIG_LIBM is not set # CONFIG_NOPRINTF_FIELDWIDTH is not set # CONFIG_LIBC_FLOATINGPOINT is not set +CONFIG_LIB_RAND_ORDER=1 # CONFIG_EOL_IS_CR is not set # CONFIG_EOL_IS_LF is not set # CONFIG_EOL_IS_BOTH_CRLF is not set @@ -393,6 +482,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # # CONFIG_SCHED_WORKQUEUE is not set # CONFIG_LIB_KBDCODEC is not set +# CONFIG_LIB_SLCDCODEC is not set # # Basic CXX Support @@ -414,7 +504,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # # CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_CAN is not set -# CONFIG_SYSTEM_COMPOSITE is not set +# CONFIG_EXAMPLES_CONFIGDATA is not set # CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_FTPC is not set @@ -427,8 +517,9 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # CONFIG_EXAMPLES_IGMP is not set # CONFIG_EXAMPLES_LCDRW is not set # CONFIG_EXAMPLES_MM is not set -# CONFIG_EXAMPLES_MOUNT is not set # CONFIG_EXAMPLES_MODBUS is not set +# CONFIG_EXAMPLES_MOUNT is not set +# CONFIG_EXAMPLES_NRF24L01TERM is not set CONFIG_EXAMPLES_NSH=y # CONFIG_EXAMPLES_NULL is not set # CONFIG_EXAMPLES_NX is not set @@ -448,6 +539,10 @@ CONFIG_EXAMPLES_NSH=y # CONFIG_EXAMPLES_ROMFS is not set # CONFIG_EXAMPLES_SENDMAIL is not set # CONFIG_EXAMPLES_SERLOOP is not set +# CONFIG_EXAMPLES_SLCD is not set +# CONFIG_EXAMPLES_SMART_TEST is not set +# CONFIG_EXAMPLES_SMART is not set +# CONFIG_EXAMPLES_TCPECHO is not set # CONFIG_EXAMPLES_TELNETD is not set # CONFIG_EXAMPLES_THTTPD is not set # CONFIG_EXAMPLES_TIFF is not set @@ -455,7 +550,6 @@ CONFIG_EXAMPLES_NSH=y # CONFIG_EXAMPLES_UDP is not set # CONFIG_EXAMPLES_UIP is not set # CONFIG_EXAMPLES_USBSERIAL is not set -# CONFIG_SYSTEM_USBMSC is not set # CONFIG_EXAMPLES_USBTERM is not set # CONFIG_EXAMPLES_WATCHDOG is not set @@ -478,14 +572,11 @@ CONFIG_EXAMPLES_NSH=y # Networking Utilities # # CONFIG_NETUTILS_CODECS is not set -# CONFIG_NETUTILS_DHCPC is not set # CONFIG_NETUTILS_DHCPD is not set # CONFIG_NETUTILS_FTPC is not set # CONFIG_NETUTILS_FTPD is not set # CONFIG_NETUTILS_JSON is not set -# CONFIG_NETUTILS_RESOLV is not set # CONFIG_NETUTILS_SMTP is not set -# CONFIG_NETUTILS_TELNETD is not set # CONFIG_NETUTILS_TFTPC is not set # CONFIG_NETUTILS_THTTPD is not set # CONFIG_NETUTILS_UIPLIB is not set @@ -507,10 +598,14 @@ CONFIG_NSH_BUILTIN_APPS=y # # Disable Individual commands # +# CONFIG_NSH_DISABLE_ADDROUTE is not set # CONFIG_NSH_DISABLE_CAT is not set # CONFIG_NSH_DISABLE_CD is not set # CONFIG_NSH_DISABLE_CP is not set +# CONFIG_NSH_DISABLE_CMP is not set # CONFIG_NSH_DISABLE_DD is not set +# CONFIG_NSH_DISABLE_DF is not set +# CONFIG_NSH_DISABLE_DELROUTE is not set # CONFIG_NSH_DISABLE_ECHO is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -524,15 +619,12 @@ CONFIG_NSH_BUILTIN_APPS=y # CONFIG_NSH_DISABLE_LS is not set # CONFIG_NSH_DISABLE_MB is not set # CONFIG_NSH_DISABLE_MKDIR is not set -# CONFIG_NSH_DISABLE_MKFATFS is not set # CONFIG_NSH_DISABLE_MKFIFO is not set # CONFIG_NSH_DISABLE_MKRD is not set # CONFIG_NSH_DISABLE_MH is not set # CONFIG_NSH_DISABLE_MOUNT is not set # CONFIG_NSH_DISABLE_MW is not set -# CONFIG_NSH_DISABLE_NSFMOUNT is not set # CONFIG_NSH_DISABLE_PS is not set -# CONFIG_NSH_DISABLE_PING is not set # CONFIG_NSH_DISABLE_PUT is not set # CONFIG_NSH_DISABLE_PWD is not set # CONFIG_NSH_DISABLE_RM is not set @@ -546,11 +638,24 @@ CONFIG_NSH_BUILTIN_APPS=y # CONFIG_NSH_DISABLE_USLEEP is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set + +# +# Configure Command Options +# +CONFIG_NSH_CMDOPT_DF_H=y CONFIG_NSH_CODECS_BUFSIZE=128 +CONFIG_NSH_CMDOPT_HEXDUMP=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 +# CONFIG_NSH_DISABLE_SEMICOLON is not set +CONFIG_NSH_CMDPARMS=y +CONFIG_NSH_TMPDIR="/tmp" +CONFIG_NSH_MAXARGUMENTS=6 +CONFIG_NSH_ARGCAT=y CONFIG_NSH_NESTDEPTH=3 # CONFIG_NSH_DISABLESCRIPT is not set +# CONFIG_NSH_DISABLE_ITEF is not set +# CONFIG_NSH_DISABLE_LOOPS is not set # CONFIG_NSH_DISABLEBG is not set CONFIG_NSH_CONSOLE=y @@ -565,7 +670,20 @@ CONFIG_NSH_CONSOLE=y # # -# System NSH Add-Ons +# Platform-specific Support +# +# CONFIG_PLATFORM_CONFIGDATA is not set + +# +# System Libraries and NSH Add-Ons +# + +# +# USB CDC/ACM Device Commands +# + +# +# USB Composite Device Commands # # @@ -578,11 +696,30 @@ CONFIG_NSH_CONSOLE=y # # +# INI File Parser +# +# CONFIG_SYSTEM_INIFILE is not set + +# # FLASH Program Installation # # CONFIG_SYSTEM_INSTALL is not set # +# FLASH Erase-all Command +# + +# +# NxPlayer media player library / command Line +# +# CONFIG_SYSTEM_NXPLAYER is not set + +# +# RAM test +# +# CONFIG_SYSTEM_RAMTEST is not set + +# # readline() # CONFIG_SYSTEM_READLINE=y @@ -611,3 +748,26 @@ CONFIG_READLINE_ECHO=y # # USB Monitor # + +# +# EMACS-like Command Line Editor +# +# CONFIG_SYSTEM_CLE is not set + +# +# VI Work-Alike Editor +# +# CONFIG_SYSTEM_VI is not set + +# +# Stack Monitor +# + +# +# USB Mass Storage Device Commands +# + +# +# Zmodem Commands +# +# CONFIG_SYSTEM_ZMODEM is not set diff --git a/nuttx/configs/lm4f120-launchpad/nsh/setenv.sh b/nuttx/configs/lm4f120-launchpad/nsh/setenv.sh index a3f2503b7..4b63eb000 100755 --- a/nuttx/configs/lm4f120-launchpad/nsh/setenv.sh +++ b/nuttx/configs/lm4f120-launchpad/nsh/setenv.sh @@ -51,6 +51,7 @@ fi # toolchain under windows. You will also have to edit this if you install # the CodeSourcery toolchain in any other location #export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" +#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin" # These are the Cygwin paths to the locations where I installed the Atollic # toolchain under windows. You will also have to edit this if you install |