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

4 files changed, 10 insertions, 7 deletions

diff --git a/nuttx/configs/lm3s8962-ek/README.txt b/nuttx/configs/lm3s8962-ek/README.txt
index fdb783466..0f796e38d 100644
--- a/nuttx/configs/lm3s8962-ek/README.txt
+++ b/nuttx/configs/lm3s8962-ek/README.txt
@@ -181,13 +181,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
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -341,7 +341,7 @@ Stellaris LM3S8962 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:
@@ -436,7 +436,7 @@ Stellaris LM3S8962 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/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig
index 79f90d5f9..1d3df2fa7 100755
--- a/nuttx/configs/lm3s8962-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig
@@ -38,7 +38,8 @@
 CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
-CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP="lm"
+CONFIG_ARCH_CHIP_LM=y
 CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S8962=y
 CONFIG_ARCH_BOARD="lm3s8962-ek"
diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig
index 8424b6623..37fc8903d 100755
--- a/nuttx/configs/lm3s8962-ek/nx/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nx/defconfig
@@ -38,7 +38,8 @@
 CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
-CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP="lm"
+CONFIG_ARCH_CHIP_LM=y
 CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S8962=y
 CONFIG_ARCH_BOARD="lm3s8962-ek"
diff --git a/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig
index 73fbff29f..731003fd0 100755
--- a/nuttx/configs/lm3s8962-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s8962-ek/ostest/defconfig
@@ -38,7 +38,8 @@
 CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_CORTEXM3=y
-CONFIG_ARCH_CHIP="lm3s"
+CONFIG_ARCH_CHIP="lm"
+CONFIG_ARCH_CHIP_LM=y
 CONFIG_ARCH_CHIP_LM3S=y
 CONFIG_ARCH_CHIP_LM3S8962=y
 CONFIG_ARCH_BOARD="lm3s8962-ek"