Rename arch/arm/src/lm3s to arch/arm/src/lm to allow a namespace that will include the lm4f

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5495 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 11 insertions, 8 deletions

diff --git a/nuttx/configs/lm3s6965-ek/README.txt b/nuttx/configs/lm3s6965-ek/README.txt
index 09a07ec68..5a9cdbf4e 100644
--- a/nuttx/configs/lm3s6965-ek/README.txt
+++ b/nuttx/configs/lm3s6965-ek/README.txt
@@ -197,13 +197,13 @@ IDEs
   2) Start the NuttX build at least one time from the Cygwin command line
      before trying to create your project.  This is necessary to create
      certain auto-generated files and directories that will be needed.
-  3) Set up include pathes:  You will need include/, arch/arm/src/lm3s,
+  3) Set up include pathes:  You will need include/, arch/arm/src/lm,
      arch/arm/src/common, arch/arm/src/armv7-m, and sched/.
   4) All assembly files need to have the definition option -D __ASSEMBLY__
      on the command line.
 
   Startup files will probably cause you some headaches.  The NuttX startup file
-  is arch/arm/src/lm3s/lm3s_vectors.S.
+  is arch/arm/src/lm/lm_vectors.S.
 
 NuttX EABI "buildroot" Toolchain
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -357,7 +357,7 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options
 
     CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory
 
-       CONFIG_ARCH_CHIP=lm3s
+       CONFIG_ARCH_CHIP=lm
 
     CONFIG_ARCH_CHIP_name - For use in C code to identify the exact
        chip:
@@ -452,7 +452,7 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options
       to build the LM3S Ethernet driver
     CONFIG_LM3S_ETHLEDS - Enable to use Ethernet LEDs on the board.
     CONFIG_LM3S_BOARDMAC - If the board-specific logic can provide
-      a MAC address (via lm3s_ethernetmac()), then this should be selected.
+      a MAC address (via lm_ethernetmac()), then this should be selected.
     CONFIG_LM3S_ETHHDUPLEX - Set to force half duplex operation
     CONFIG_LM3S_ETHNOAUTOCRC - Set to suppress auto-CRC generation
     CONFIG_LM3S_ETHNOPAD - Set to suppress Tx padding
diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig
index 64f4397cb..c1827920b 100755
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig
@@ -65,6 +65,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_IMX is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
+CONFIG_ARCH_CHIP_LM=y
 CONFIG_ARCH_CHIP_LM3S=y
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
@@ -76,7 +77,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="lm3s"
+CONFIG_ARCH_CHIP="lm"
 CONFIG_ARCH_HAVE_MPU=y
 # 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 be75c2875..e3cac8dd7 100755
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nx/defconfig
@@ -65,6 +65,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_IMX is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
+CONFIG_ARCH_CHIP_LM=y
 CONFIG_ARCH_CHIP_LM3S=y
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
@@ -76,7 +77,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="lm3s"
+CONFIG_ARCH_CHIP="lm"
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
 CONFIG_BOARD_LOOPSPERMSEC=4531
diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig
index 83e89a6ae..81247c795 100755
--- a/nuttx/configs/lm3s6965-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig
@@ -65,6 +65,7 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_DM320 is not set
 # CONFIG_ARCH_CHIP_IMX is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
+CONFIG_ARCH_CHIP_LM=y
 CONFIG_ARCH_CHIP_LM3S=y
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
@@ -76,7 +77,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="lm3s"
+CONFIG_ARCH_CHIP="lm"
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
 CONFIG_BOARD_LOOPSPERMSEC=4531
diff --git a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
index 8ebd4cf65..4cd2eddc7 100644
--- a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
+++ b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
@@ -1,6 +1,6 @@
 /************************************************************************************
  * configs/lm3s6965-ek/src/lm3s6965ek_internal.h
- * arch/arm/src/board/lm3s6965ek_internal.n
+ * arch/arm/src/board/lm3s6965ek_internal.h
  *
  *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>