functions and definitions renamed from lm_ to tiva_

7 files changed, 101 insertions, 76 deletions

diff --git a/nuttx/configs/lm3s8962-ek/README.txt b/nuttx/configs/lm3s8962-ek/README.txt
index 1081f604d..fd25170cc 100644
--- a/nuttx/configs/lm3s8962-ek/README.txt
+++ b/nuttx/configs/lm3s8962-ek/README.txt
@@ -399,15 +399,15 @@ Stellaris LM3S8962 Evaluation Kit Configuration Options
   Additional interrupt support can be disabled if desired to reduce memory
   footprint.
 
-    CONFIG_LM_DISABLE_GPIOA_IRQS=n
-    CONFIG_LM_DISABLE_GPIOB_IRQS=n
-    CONFIG_LM_DISABLE_GPIOC_IRQS=n
-    CONFIG_LM_DISABLE_GPIOD_IRQS=n
-    CONFIG_LM_DISABLE_GPIOE_IRQS=n
-    CONFIG_LM_DISABLE_GPIOF_IRQS=n
-    CONFIG_LM_DISABLE_GPIOG_IRQS=n
-    CONFIG_LM_DISABLE_GPIOH_IRQS=n
-    CONFIG_LM_DISABLE_GPIOJ_IRQS=y
+    CONFIG_TIVA_DISABLE_GPIOA_IRQS=n
+    CONFIG_TIVA_DISABLE_GPIOB_IRQS=n
+    CONFIG_TIVA_DISABLE_GPIOC_IRQS=n
+    CONFIG_TIVA_DISABLE_GPIOD_IRQS=n
+    CONFIG_TIVA_DISABLE_GPIOE_IRQS=n
+    CONFIG_TIVA_DISABLE_GPIOF_IRQS=n
+    CONFIG_TIVA_DISABLE_GPIOG_IRQS=n
+    CONFIG_TIVA_DISABLE_GPIOH_IRQS=n
+    CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y
  
   LM3S8962 specific device driver settings
 
@@ -432,18 +432,18 @@ Stellaris LM3S8962 Evaluation Kit Configuration Options
       value is large, then larger values of this setting may cause
       Rx FIFO overrun errors.  Default: half of the Tx FIFO size (4).
 
-    CONFIG_LM_ETHERNET - This must be set (along with CONFIG_NET)
+    CONFIG_TIVA_ETHERNET - This must be set (along with CONFIG_NET)
       to build the Stellaris Ethernet driver
-    CONFIG_LM_ETHLEDS - Enable to use Ethernet LEDs on the board.
-    CONFIG_LM_BOARDMAC - If the board-specific logic can provide
+    CONFIG_TIVA_ETHLEDS - Enable to use Ethernet LEDs on the board.
+    CONFIG_TIVA_BOARDMAC - If the board-specific logic can provide
       a MAC address (via tiva_ethernetmac()), then this should be selected.
-    CONFIG_LM_ETHHDUPLEX - Set to force half duplex operation
-    CONFIG_LM_ETHNOAUTOCRC - Set to suppress auto-CRC generation
-    CONFIG_LM_ETHNOPAD - Set to suppress Tx padding
-    CONFIG_LM_MULTICAST - Set to enable multicast frames
-    CONFIG_LM_PROMISCUOUS - Set to enable promiscuous mode
-    CONFIG_LM_BADCRC - Set to enable bad CRC rejection.
-    CONFIG_LM_DUMPPACKET - Dump each packet received/sent to the console.
+    CONFIG_TIVA_ETHHDUPLEX - Set to force half duplex operation
+    CONFIG_TIVA_ETHNOAUTOCRC - Set to suppress auto-CRC generation
+    CONFIG_TIVA_ETHNOPAD - Set to suppress Tx padding
+    CONFIG_TIVA_MULTICAST - Set to enable multicast frames
+    CONFIG_TIVA_PROMISCUOUS - Set to enable promiscuous mode
+    CONFIG_TIVA_BADCRC - Set to enable bad CRC rejection.
+    CONFIG_TIVA_DUMPPACKET - Dump each packet received/sent to the console.
 
 Configurations
 ^^^^^^^^^^^^^^
diff --git a/nuttx/configs/lm3s8962-ek/include/board.h b/nuttx/configs/lm3s8962-ek/include/board.h
index a3a0520d6..180e44dd3 100644
--- a/nuttx/configs/lm3s8962-ek/include/board.h
+++ b/nuttx/configs/lm3s8962-ek/include/board.h
@@ -63,7 +63,7 @@
  * of (400 / 2) / 4 = 50MHz
  */
 
-#define LM_SYSDIV            4
+#define TIVA_SYSDIV          4
 #define SYSCLK_FREQUENCY     50000000  /* 50MHz */
 
 /* Other RCC settings:
@@ -74,7 +74,7 @@
  * - No auto-clock gating reset
  */
 
-#define LM_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(LM_SYSDIV))
+#define TIVA_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(TIVA_SYSDIV))
 
 /* RCC2 settings -- RCC2 not used.  Other RCC2 settings
  *
@@ -83,7 +83,7 @@
  * - Not using RCC2
  */
 
-#define LM_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(LM_SYSDIV))
+#define TIVA_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(TIVA_SYSDIV))
 
 /* LED definitions ******************************************************************/
 
@@ -128,12 +128,12 @@ void tiva_boardinitialize(void);
  *
  * Description:
  *   For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile
- *   USER0 and USER1 registers.  If CONFIG_LM_BOARDMAC is defined, this function
+ *   USER0 and USER1 registers.  If CONFIG_TIVA_BOARDMAC is defined, this function
  *   will obtain the MAC address from these registers.
  *
  ************************************************************************************/
 
-#ifdef CONFIG_LM_BOARDMAC
+#ifdef CONFIG_TIVA_BOARDMAC
 struct ether_addr;
 void tiva_ethernetmac(struct ether_addr *ethaddr);
 #endif
diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig
index 5e50cb404..72bbdec76 100644
--- a/nuttx/configs/lm3s8962-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig
@@ -34,6 +34,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
@@ -78,6 +79,7 @@ CONFIG_ARCH="arm"
 # 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
@@ -103,7 +105,8 @@ CONFIG_ARCH_CHIP="tiva"
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 # CONFIG_ARMV7M_CMNVECTOR is not set
 # CONFIG_ARCH_HAVE_FPU is not set
-# CONFIG_ARCH_HAVE_MPU is not set
+CONFIG_ARCH_HAVE_MPU=y
+# CONFIG_ARMV7M_MPU is not set
 
 #
 # ARMV7M Configuration Options
@@ -119,7 +122,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_OABI_TOOLCHAIN is not set
 
 #
-# Stellaris Configuration Options
+# Tiva/Stellaris Configuration Options
 #
 # CONFIG_ARCH_CHIP_LM3S6918 is not set
 # CONFIG_ARCH_CHIP_LM3S9B96 is not set
@@ -131,45 +134,45 @@ CONFIG_ARCH_CHIP_LM3S=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_TIVA_UART0=y
+# CONFIG_TIVA_UART1 is not set
+# CONFIG_TIVA_UART2 is not set
 # CONFIG_SSI0_DISABLE is not set
 CONFIG_SSI1_DISABLE=y
-CONFIG_LM_ETHERNET=y
-# CONFIG_LM_FLASH is not set
+CONFIG_TIVA_ETHERNET=y
+# CONFIG_TIVA_FLASH is not set
 
 #
 # Disable GPIO Interrupts
 #
-# CONFIG_LM_DISABLE_GPIOA_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOB_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOC_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOD_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOE_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOF_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOG_IRQS is not set
-CONFIG_LM_DISABLE_GPIOH_IRQS=y
-CONFIG_LM_DISABLE_GPIOJ_IRQS=y
-
-#
-# Stellaris Ethernet Configuration
-#
-# CONFIG_LM_ETHLEDS is not set
-# CONFIG_LM_BOARDMAC is not set
-# CONFIG_LM_ETHHDUPLEX is not set
-# CONFIG_LM_ETHNOAUTOCRC is not set
-# CONFIG_LM_ETHNOPAD is not set
-# CONFIG_LM_MULTICAST is not set
-# CONFIG_LM_PROMISCUOUS is not set
-# CONFIG_LM_TIMESTAMP is not set
-# CONFIG_LM_BADCRC is not set
+# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set
+CONFIG_TIVA_DISABLE_GPIOH_IRQS=y
+CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y
+
+#
+# Tiva/Stellaris Ethernet Configuration
+#
+# CONFIG_TIVA_ETHLEDS is not set
+# CONFIG_TIVA_BOARDMAC is not set
+# CONFIG_TIVA_ETHHDUPLEX is not set
+# CONFIG_TIVA_ETHNOAUTOCRC is not set
+# CONFIG_TIVA_ETHNOPAD is not set
+# CONFIG_TIVA_MULTICAST is not set
+# CONFIG_TIVA_PROMISCUOUS is not set
+# CONFIG_TIVA_TIMESTAMP is not set
+# CONFIG_TIVA_BADCRC is not set
 # CONFIG_M3S_DUMPPACKET is not set
 
 #
-# Stellaris SSI Configuration
+# Tiva/Stellaris SSI Configuration
 #
 CONFIG_SSI_POLLWAIT=y
 CONFIG_SSI_TXLIMIT=4
@@ -190,6 +193,7 @@ CONFIG_ARCH_HAVE_VFORK=y
 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
@@ -371,7 +375,27 @@ CONFIG_NETDEVICES=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
diff --git a/nuttx/configs/lm3s8962-ek/nsh/setenv.sh b/nuttx/configs/lm3s8962-ek/nsh/setenv.sh
index 1db7f8ee2..e9aa7ca32 100755
--- a/nuttx/configs/lm3s8962-ek/nsh/setenv.sh
+++ b/nuttx/configs/lm3s8962-ek/nsh/setenv.sh
@@ -50,7 +50,8 @@ fi
 # This is the Cygwin path to the location where I installed the CodeSourcery
 # 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 G++ Lite/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig
index d37e4aa9d..0de126d3b 100644
--- a/nuttx/configs/lm3s8962-ek/nx/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nx/defconfig
@@ -133,26 +133,26 @@ CONFIG_ARCH_CHIP_LM3S=y
 #
 # Stellaris Peripheral Support
 #
-CONFIG_LM_UART0=y
-# CONFIG_LM_UART1 is not set
-# CONFIG_LM_UART2 is not set
+CONFIG_TIVA_UART0=y
+# CONFIG_TIVA_UART1 is not set
+# CONFIG_TIVA_UART2 is not set
 # CONFIG_SSI0_DISABLE is not set
 CONFIG_SSI1_DISABLE=y
-# CONFIG_LM_ETHERNET is not set
-# CONFIG_LM_FLASH is not set
+# CONFIG_TIVA_ETHERNET is not set
+# CONFIG_TIVA_FLASH is not set
 
 #
 # Disable GPIO Interrupts
 #
-# CONFIG_LM_DISABLE_GPIOA_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOB_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOC_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOD_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOE_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOF_IRQS is not set
-# CONFIG_LM_DISABLE_GPIOG_IRQS is not set
-CONFIG_LM_DISABLE_GPIOH_IRQS=y
-CONFIG_LM_DISABLE_GPIOJ_IRQS=y
+# CONFIG_TIVA_DISABLE_GPIOA_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOB_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOC_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOD_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOE_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOF_IRQS is not set
+# CONFIG_TIVA_DISABLE_GPIOG_IRQS is not set
+CONFIG_TIVA_DISABLE_GPIOH_IRQS=y
+CONFIG_TIVA_DISABLE_GPIOJ_IRQS=y
 
 #
 # Stellaris SSI Configuration
diff --git a/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h b/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
index ece21e18c..675179458 100644
--- a/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
+++ b/nuttx/configs/lm3s8962-ek/src/lm3s8962ek_internal.h
@@ -56,12 +56,12 @@
  * expanded).
  */
 
-#if LM_NSSI == 0
+#if TIVA_NSSI == 0
 #  undef CONFIG_SSI0_DISABLE
 #  define CONFIG_SSI0_DISABLE 1
 #  undef CONFIG_SSI1_DISABLE
 #  define CONFIG_SSI1_DISABLE 1
-#elif LM_NSSI == 1
+#elif TIVA_NSSI == 1
 #  undef CONFIG_SSI1_DISABLE
 #  define CONFIG_SSI1_DISABLE 1
 #endif
diff --git a/nuttx/configs/lm3s8962-ek/src/up_ethernet.c b/nuttx/configs/lm3s8962-ek/src/up_ethernet.c
index 487e4004a..bc20ea0f1 100644
--- a/nuttx/configs/lm3s8962-ek/src/up_ethernet.c
+++ b/nuttx/configs/lm3s8962-ek/src/up_ethernet.c
@@ -67,12 +67,12 @@
  *
  * Description:
  *   For the Ethernet Eval Kits, the MAC address will be stored in the non-volatile
- *   USER0 and USER1 registers.  If CONFIG_LM_BOARDMAC is defined, this function
+ *   USER0 and USER1 registers.  If CONFIG_TIVA_BOARDMAC is defined, this function
  *   will obtain the MAC address from these registers.
  *
  ************************************************************************************/
 
-#ifdef CONFIG_LM_BOARDMAC
+#ifdef CONFIG_TIVA_BOARDMAC
 void tiva_ethernetmac(struct ether_addr *ethaddr)
 {
   uint32_t user0;
@@ -80,8 +80,8 @@ void tiva_ethernetmac(struct ether_addr *ethaddr)
 
   /* Get the current value of the user registers */
 
-  user0 = getreg32(LM_FLASH_USERREG0);
-  user1 = getreg32(LM_FLASH_USERREG1);
+  user0 = getreg32(TIVA_FLASH_USERREG0);
+  user1 = getreg32(TIVA_FLASH_USERREG1);
 
   nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);