diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3678e5c637d..87242b2afe7 100644
--- a/arch/arm/Kconfig
+++ b/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 Stellaris LMS3 and LM4F architectures (ARM Cortex-M3/4)
+		TI/Luminary Stellaris LMS3 and LM4F architectures (ARM Cortex-M3/4)
+
+config ARCH_CHIP_TIVA
+	bool "TI Tiva"
+	select ARCH_HAVE_CMNVECTOR
+	select ARCH_HAVE_MPU
+	select ARCH_HAVE_FPU
+	---help---
+		TI Tiva TM4C architectures (ARM Cortex-M4)
 
 config ARCH_CHIP_LPC17XX
 	bool "NXP LPC17xx"
@@ -221,7 +230,7 @@ config ARCH_CHIP
 	default "imx"		if ARCH_CHIP_IMX
 	default "kinetis"	if ARCH_CHIP_KINETIS
 	default "kl"		if ARCH_CHIP_KL
-	default "lm"		if ARCH_CHIP_LM
+	default "tiva"		if ARCH_CHIP_LM || ARCH_CHIP_TIVA
 	default "lpc17xx"	if ARCH_CHIP_LPC17XX
 	default "lpc214x"	if ARCH_CHIP_LPC214X
 	default "lpc2378"	if ARCH_CHIP_LPC2378
@@ -348,8 +357,8 @@ endif
 if ARCH_CHIP_KL
 source arch/arm/src/kl/Kconfig
 endif
-if ARCH_CHIP_LM
-source arch/arm/src/lm/Kconfig
+if ARCH_CHIP_LM || ARCH_CHIP_TIVA
+source arch/arm/src/tiva/Kconfig
 endif
 if ARCH_CHIP_LPC17XX
 source arch/arm/src/lpc17xx/Kconfig
diff --git a/arch/arm/include/lm/chip.h b/arch/arm/include/tiva/chip.h
similarity index 99%
rename from arch/arm/include/lm/chip.h
rename to arch/arm/include/tiva/chip.h
index 53ca4d9f0b6..d3f043735c0 100644
--- a/arch/arm/include/lm/chip.h
+++ b/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/arch/arm/include/lm/irq.h b/arch/arm/include/tiva/irq.h
similarity index 98%
rename from arch/arm/include/lm/irq.h
rename to arch/arm/include/tiva/irq.h
index 51e362da50c..21daa4fa7a7 100644
--- a/arch/arm/include/lm/irq.h
+++ b/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/arch/arm/include/lm/lm3s_irq.h b/arch/arm/include/tiva/lm3s_irq.h
similarity index 99%
rename from arch/arm/include/lm/lm3s_irq.h
rename to arch/arm/include/tiva/lm3s_irq.h
index 04b6d9a1200..5f4f1cc9ce6 100644
--- a/arch/arm/include/lm/lm3s_irq.h
+++ b/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/arch/arm/include/lm/lm4f_irq.h b/arch/arm/include/tiva/lm4f_irq.h
similarity index 99%
rename from arch/arm/include/lm/lm4f_irq.h
rename to arch/arm/include/tiva/lm4f_irq.h
index f00cf8aad5d..11cd30c9b54 100644
--- a/arch/arm/include/lm/lm4f_irq.h
+++ b/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/arch/arm/src/lm/Kconfig b/arch/arm/src/tiva/Kconfig
similarity index 84%
rename from arch/arm/src/lm/Kconfig
rename to arch/arm/src/tiva/Kconfig
index 84f326fd955..ef2b827f8dd 100644
--- a/arch/arm/src/lm/Kconfig
+++ b/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/arch/arm/src/lm/Make.defs b/arch/arm/src/tiva/Make.defs
similarity index 99%
rename from arch/arm/src/lm/Make.defs
rename to arch/arm/src/tiva/Make.defs
index 141b5003aa6..46ea36e257f 100644
--- a/arch/arm/src/lm/Make.defs
+++ b/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/arch/arm/src/lm/chip.h b/arch/arm/src/tiva/chip.h
similarity index 95%
rename from arch/arm/src/lm/chip.h
rename to arch/arm/src/tiva/chip.h
index e476ce43535..a6016bc0dd1 100644
--- a/arch/arm/src/lm/chip.h
+++ b/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/arch/arm/src/lm/chip/lm3s_memorymap.h b/arch/arm/src/tiva/chip/lm3s_memorymap.h
similarity index 99%
rename from arch/arm/src/lm/chip/lm3s_memorymap.h
rename to arch/arm/src/tiva/chip/lm3s_memorymap.h
index d4bae8358b5..14ba1d42d7f 100644
--- a/arch/arm/src/lm/chip/lm3s_memorymap.h
+++ b/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/arch/arm/src/lm/chip/lm3s_pinmap.h b/arch/arm/src/tiva/chip/lm3s_pinmap.h
similarity index 99%
rename from arch/arm/src/lm/chip/lm3s_pinmap.h
rename to arch/arm/src/tiva/chip/lm3s_pinmap.h
index ca1d5306462..534d620635b 100644
--- a/arch/arm/src/lm/chip/lm3s_pinmap.h
+++ b/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/arch/arm/src/lm/chip/lm3s_syscontrol.h b/arch/arm/src/tiva/chip/lm3s_syscontrol.h
similarity index 99%
rename from arch/arm/src/lm/chip/lm3s_syscontrol.h
rename to arch/arm/src/tiva/chip/lm3s_syscontrol.h
index a8e21677879..544e63d185e 100644
--- a/arch/arm/src/lm/chip/lm3s_syscontrol.h
+++ b/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/arch/arm/src/lm/chip/lm3s_vectors.h b/arch/arm/src/tiva/chip/lm3s_vectors.h
similarity index 99%
rename from arch/arm/src/lm/chip/lm3s_vectors.h
rename to arch/arm/src/tiva/chip/lm3s_vectors.h
index 58447793d90..2c723b6319b 100644
--- a/arch/arm/src/lm/chip/lm3s_vectors.h
+++ b/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/arch/arm/src/lm/chip/lm4f_memorymap.h b/arch/arm/src/tiva/chip/lm4f_memorymap.h
similarity index 98%
rename from arch/arm/src/lm/chip/lm4f_memorymap.h
rename to arch/arm/src/tiva/chip/lm4f_memorymap.h
index 4d715e4707b..76e8283a38f 100644
--- a/arch/arm/src/lm/chip/lm4f_memorymap.h
+++ b/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/arch/arm/src/lm/chip/lm4f_pinmap.h b/arch/arm/src/tiva/chip/lm4f_pinmap.h
similarity index 98%
rename from arch/arm/src/lm/chip/lm4f_pinmap.h
rename to arch/arm/src/tiva/chip/lm4f_pinmap.h
index 6f4bc27a673..91c58bd2de1 100644
--- a/arch/arm/src/lm/chip/lm4f_pinmap.h
+++ b/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/arch/arm/src/lm/chip/lm4f_syscontrol.h b/arch/arm/src/tiva/chip/lm4f_syscontrol.h
similarity index 99%
rename from arch/arm/src/lm/chip/lm4f_syscontrol.h
rename to arch/arm/src/tiva/chip/lm4f_syscontrol.h
index cc7659f299e..a9c6d483a49 100644
--- a/arch/arm/src/lm/chip/lm4f_syscontrol.h
+++ b/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/arch/arm/src/lm/chip/lm4f_vectors.h b/arch/arm/src/tiva/chip/lm4f_vectors.h
similarity index 99%
rename from arch/arm/src/lm/chip/lm4f_vectors.h
rename to arch/arm/src/tiva/chip/lm4f_vectors.h
index c8e69377b94..1918f9c6d7e 100644
--- a/arch/arm/src/lm/chip/lm4f_vectors.h
+++ b/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/arch/arm/src/lm/chip/lm_epi.h b/arch/arm/src/tiva/chip/lm_epi.h
similarity index 97%
rename from arch/arm/src/lm/chip/lm_epi.h
rename to arch/arm/src/tiva/chip/lm_epi.h
index 47d79061555..317ea8ea687 100644
--- a/arch/arm/src/lm/chip/lm_epi.h
+++ b/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/arch/arm/src/lm/chip/lm_ethernet.h b/arch/arm/src/tiva/chip/lm_ethernet.h
similarity index 98%
rename from arch/arm/src/lm/chip/lm_ethernet.h
rename to arch/arm/src/tiva/chip/lm_ethernet.h
index 02908d222ac..e05c4a198ee 100644
--- a/arch/arm/src/lm/chip/lm_ethernet.h
+++ b/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/arch/arm/src/lm/chip/lm_flash.h b/arch/arm/src/tiva/chip/lm_flash.h
similarity index 97%
rename from arch/arm/src/lm/chip/lm_flash.h
rename to arch/arm/src/tiva/chip/lm_flash.h
index 45b5154bb8a..a6ae15c3662 100644
--- a/arch/arm/src/lm/chip/lm_flash.h
+++ b/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/arch/arm/src/lm/chip/lm_gpio.h b/arch/arm/src/tiva/chip/lm_gpio.h
similarity index 99%
rename from arch/arm/src/lm/chip/lm_gpio.h
rename to arch/arm/src/tiva/chip/lm_gpio.h
index 3fdf5086fe8..b8ef66756c2 100644
--- a/arch/arm/src/lm/chip/lm_gpio.h
+++ b/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/arch/arm/src/lm/chip/lm_i2c.h b/arch/arm/src/tiva/chip/lm_i2c.h
similarity index 98%
rename from arch/arm/src/lm/chip/lm_i2c.h
rename to arch/arm/src/tiva/chip/lm_i2c.h
index 88ce31b7781..3b0f3c8989c 100644
--- a/arch/arm/src/lm/chip/lm_i2c.h
+++ b/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/arch/arm/src/lm/chip/lm_memorymap.h b/arch/arm/src/tiva/chip/lm_memorymap.h
similarity index 94%
rename from arch/arm/src/lm/chip/lm_memorymap.h
rename to arch/arm/src/tiva/chip/lm_memorymap.h
index d8257fc0255..076447e70a6 100644
--- a/arch/arm/src/lm/chip/lm_memorymap.h
+++ b/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/arch/arm/src/lm/chip/lm_pinmap.h b/arch/arm/src/tiva/chip/lm_pinmap.h
similarity index 94%
rename from arch/arm/src/lm/chip/lm_pinmap.h
rename to arch/arm/src/tiva/chip/lm_pinmap.h
index 00b42e73bb7..0efaa19aeaa 100644
--- a/arch/arm/src/lm/chip/lm_pinmap.h
+++ b/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/arch/arm/src/lm/chip/lm_ssi.h b/arch/arm/src/tiva/chip/lm_ssi.h
similarity index 98%
rename from arch/arm/src/lm/chip/lm_ssi.h
rename to arch/arm/src/tiva/chip/lm_ssi.h
index 5243bf1120b..90fbd750a38 100644
--- a/arch/arm/src/lm/chip/lm_ssi.h
+++ b/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/arch/arm/src/lm/chip/lm_syscontrol.h b/arch/arm/src/tiva/chip/lm_syscontrol.h
similarity index 93%
rename from arch/arm/src/lm/chip/lm_syscontrol.h
rename to arch/arm/src/tiva/chip/lm_syscontrol.h
index 008fa2d34ab..bf50c521412 100644
--- a/arch/arm/src/lm/chip/lm_syscontrol.h
+++ b/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/arch/arm/src/lm/chip/lm_timer.h b/arch/arm/src/tiva/chip/lm_timer.h
similarity index 97%
rename from arch/arm/src/lm/chip/lm_timer.h
rename to arch/arm/src/tiva/chip/lm_timer.h
index 5ed68f13a07..b3fd06c7bb8 100644
--- a/arch/arm/src/lm/chip/lm_timer.h
+++ b/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/arch/arm/src/lm/chip/lm_uart.h b/arch/arm/src/tiva/chip/lm_uart.h
similarity index 99%
rename from arch/arm/src/lm/chip/lm_uart.h
rename to arch/arm/src/tiva/chip/lm_uart.h
index 2ad06529465..f32a0a166e2 100644
--- a/arch/arm/src/lm/chip/lm_uart.h
+++ b/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/arch/arm/src/lm/chip/lm_vectors.h b/arch/arm/src/tiva/chip/lm_vectors.h
similarity index 98%
rename from arch/arm/src/lm/chip/lm_vectors.h
rename to arch/arm/src/tiva/chip/lm_vectors.h
index 97227bf2932..34ea2cae8a7 100644
--- a/arch/arm/src/lm/chip/lm_vectors.h
+++ b/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/arch/arm/src/lm/lm_allocateheap.c b/arch/arm/src/tiva/lm_allocateheap.c
similarity index 99%
rename from arch/arm/src/lm/lm_allocateheap.c
rename to arch/arm/src/tiva/lm_allocateheap.c
index 08a000dd6a7..bb2271e7de5 100644
--- a/arch/arm/src/lm/lm_allocateheap.c
+++ b/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/arch/arm/src/lm/lm_dumpgpio.c b/arch/arm/src/tiva/lm_dumpgpio.c
similarity index 99%
rename from arch/arm/src/lm/lm_dumpgpio.c
rename to arch/arm/src/tiva/lm_dumpgpio.c
index d1202efa42b..8373214787b 100644
--- a/arch/arm/src/lm/lm_dumpgpio.c
+++ b/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/arch/arm/src/lm/lm_ethernet.c b/arch/arm/src/tiva/lm_ethernet.c
similarity index 99%
rename from arch/arm/src/lm/lm_ethernet.c
rename to arch/arm/src/tiva/lm_ethernet.c
index 88cc164a797..c3cd02ab5f5 100644
--- a/arch/arm/src/lm/lm_ethernet.c
+++ b/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/arch/arm/src/lm/lm_ethernet.h b/arch/arm/src/tiva/lm_ethernet.h
similarity index 95%
rename from arch/arm/src/lm/lm_ethernet.h
rename to arch/arm/src/tiva/lm_ethernet.h
index e3cc6506775..5ffa3b59d06 100644
--- a/arch/arm/src/lm/lm_ethernet.h
+++ b/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/arch/arm/src/lm/lm_flash.c b/arch/arm/src/tiva/lm_flash.c
similarity index 99%
rename from arch/arm/src/lm/lm_flash.c
rename to arch/arm/src/tiva/lm_flash.c
index 1a54905259b..1d573103e8f 100644
--- a/arch/arm/src/lm/lm_flash.c
+++ b/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/arch/arm/src/lm/lm_gpio.c b/arch/arm/src/tiva/lm_gpio.c
similarity index 99%
rename from arch/arm/src/lm/lm_gpio.c
rename to arch/arm/src/tiva/lm_gpio.c
index 6607966a225..af1eeacb19f 100644
--- a/arch/arm/src/lm/lm_gpio.c
+++ b/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/arch/arm/src/lm/lm_gpio.h b/arch/arm/src/tiva/lm_gpio.h
similarity index 98%
rename from arch/arm/src/lm/lm_gpio.h
rename to arch/arm/src/tiva/lm_gpio.h
index a8206c10995..6531b2a280b 100644
--- a/arch/arm/src/lm/lm_gpio.h
+++ b/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/arch/arm/src/lm/lm_gpioirq.c b/arch/arm/src/tiva/lm_gpioirq.c
similarity index 99%
rename from arch/arm/src/lm/lm_gpioirq.c
rename to arch/arm/src/tiva/lm_gpioirq.c
index 8c0da485545..ccf689cd50d 100644
--- a/arch/arm/src/lm/lm_gpioirq.c
+++ b/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/arch/arm/src/lm/lm_irq.c b/arch/arm/src/tiva/lm_irq.c
similarity index 99%
rename from arch/arm/src/lm/lm_irq.c
rename to arch/arm/src/tiva/lm_irq.c
index 6ada4d3e90b..1829639608f 100644
--- a/arch/arm/src/lm/lm_irq.c
+++ b/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/arch/arm/src/lm/lm_lowputc.c b/arch/arm/src/tiva/lm_lowputc.c
similarity index 99%
rename from arch/arm/src/lm/lm_lowputc.c
rename to arch/arm/src/tiva/lm_lowputc.c
index 6bb80331459..e2e26d4a1fd 100644
--- a/arch/arm/src/lm/lm_lowputc.c
+++ b/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/arch/arm/src/lm/lm_lowputc.h b/arch/arm/src/tiva/lm_lowputc.h
similarity index 97%
rename from arch/arm/src/lm/lm_lowputc.h
rename to arch/arm/src/tiva/lm_lowputc.h
index cc9a5d0ca86..96ed97ebb57 100644
--- a/arch/arm/src/lm/lm_lowputc.h
+++ b/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/arch/arm/src/lm/lm_mpuinit.c b/arch/arm/src/tiva/lm_mpuinit.c
similarity index 99%
rename from arch/arm/src/lm/lm_mpuinit.c
rename to arch/arm/src/tiva/lm_mpuinit.c
index db06de1c117..8e4b2e37296 100644
--- a/arch/arm/src/lm/lm_mpuinit.c
+++ b/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/arch/arm/src/lm/lm_mpuinit.h b/arch/arm/src/tiva/lm_mpuinit.h
similarity index 95%
rename from arch/arm/src/lm/lm_mpuinit.h
rename to arch/arm/src/tiva/lm_mpuinit.h
index 3c9a06c213e..763b5003e2c 100644
--- a/arch/arm/src/lm/lm_mpuinit.h
+++ b/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/arch/arm/src/lm/lm_serial.c b/arch/arm/src/tiva/lm_serial.c
similarity index 99%
rename from arch/arm/src/lm/lm_serial.c
rename to arch/arm/src/tiva/lm_serial.c
index 61999d45aa8..86532854e40 100644
--- a/arch/arm/src/lm/lm_serial.c
+++ b/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/arch/arm/src/lm/lm_ssi.c b/arch/arm/src/tiva/lm_ssi.c
similarity index 99%
rename from arch/arm/src/lm/lm_ssi.c
rename to arch/arm/src/tiva/lm_ssi.c
index d6769e2da55..3e4aa30f90a 100644
--- a/arch/arm/src/lm/lm_ssi.c
+++ b/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/arch/arm/src/lm/lm_ssi.h b/arch/arm/src/tiva/lm_ssi.h
similarity index 97%
rename from arch/arm/src/lm/lm_ssi.h
rename to arch/arm/src/tiva/lm_ssi.h
index f1c7be15518..7ce0e46c02f 100644
--- a/arch/arm/src/lm/lm_ssi.h
+++ b/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/arch/arm/src/lm/lm_start.c b/arch/arm/src/tiva/lm_start.c
similarity index 99%
rename from arch/arm/src/lm/lm_start.c
rename to arch/arm/src/tiva/lm_start.c
index 184170dbf73..726a0814891 100644
--- a/arch/arm/src/lm/lm_start.c
+++ b/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/arch/arm/src/lm/lm_syscontrol.c b/arch/arm/src/tiva/lm_syscontrol.c
similarity index 99%
rename from arch/arm/src/lm/lm_syscontrol.c
rename to arch/arm/src/tiva/lm_syscontrol.c
index b4210c44aa5..c72e8580ce6 100644
--- a/arch/arm/src/lm/lm_syscontrol.c
+++ b/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/arch/arm/src/lm/lm_syscontrol.h b/arch/arm/src/tiva/lm_syscontrol.h
similarity index 95%
rename from arch/arm/src/lm/lm_syscontrol.h
rename to arch/arm/src/tiva/lm_syscontrol.h
index 98fbc81cb1c..9a11875b90d 100644
--- a/arch/arm/src/lm/lm_syscontrol.h
+++ b/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/arch/arm/src/lm/lm_timerisr.c b/arch/arm/src/tiva/lm_timerisr.c
similarity index 99%
rename from arch/arm/src/lm/lm_timerisr.c
rename to arch/arm/src/tiva/lm_timerisr.c
index 49e11e5c5a5..0a3ea27de49 100644
--- a/arch/arm/src/lm/lm_timerisr.c
+++ b/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/arch/arm/src/lm/lm_userspace.c b/arch/arm/src/tiva/lm_userspace.c
similarity index 99%
rename from arch/arm/src/lm/lm_userspace.c
rename to arch/arm/src/tiva/lm_userspace.c
index f198f5c2f5b..9bd3ffbf70c 100644
--- a/arch/arm/src/lm/lm_userspace.c
+++ b/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/arch/arm/src/lm/lm_userspace.h b/arch/arm/src/tiva/lm_userspace.h
similarity index 95%
rename from arch/arm/src/lm/lm_userspace.h
rename to arch/arm/src/tiva/lm_userspace.h
index 37c0aff31cc..b4197f64e91 100644
--- a/arch/arm/src/lm/lm_userspace.h
+++ b/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/arch/arm/src/lm/lm_vectors.S b/arch/arm/src/tiva/lm_vectors.S
similarity index 99%
rename from arch/arm/src/lm/lm_vectors.S
rename to arch/arm/src/tiva/lm_vectors.S
index ede558ec70c..6e3f8a05827 100644
--- a/arch/arm/src/lm/lm_vectors.S
+++ b/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.