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

2 files changed, 184 insertions, 23 deletions

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