Change naming of all Stellaris pre-processor symbols from LM3S_ to LM_ to make room in the namespace for LM4F

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

8 files changed, 28 insertions, 27 deletions

diff --git a/nuttx/configs/lm3s6965-ek/README.txt b/nuttx/configs/lm3s6965-ek/README.txt
index 813e11467..77f034bf5 100644
--- a/nuttx/configs/lm3s6965-ek/README.txt
+++ b/nuttx/configs/lm3s6965-ek/README.txt
@@ -387,7 +387,7 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options
 
        CONFIG_DRAM_START=0x20000000
 
-    CONFIG_ARCH_IRQPRIO - The LM3S6918 supports interrupt prioritization
+    CONFIG_ARCH_IRQPRIO - The LM3S6965 supports interrupt prioritization
 
        CONFIG_ARCH_IRQPRIO=y
 
@@ -411,7 +411,7 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options
        the delay actually is 100 seconds.
 
   There are configurations for disabling support for interrupts GPIO ports.
-  GPIOJ must be disabled because it does not exist on the LM3S6918.
+  GPIOJ must be disabled because it does not exist on the LM3S6965.
   Additional interrupt support can be disabled if desired to reduce memory
   footprint.
 
@@ -425,7 +425,7 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options
     CONFIG_LM_DISABLE_GPIOH_IRQS=n
     CONFIG_LM_DISABLE_GPIOJ_IRQS=y
  
-  LM3S6818 specific device driver settings
+  LM3S6965 specific device driver settings
 
     CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
        console and ttys0 (default is the UART0).
@@ -449,7 +449,7 @@ Stellaris LM3S6965 Evaluation Kit Configuration Options
       Rx FIFO overrun errors.  Default: half of the Tx FIFO size (4).
 
     CONFIG_LM_ETHERNET - This must be set (along with CONFIG_NET)
-      to build the LM3S Ethernet driver
+      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
       a MAC address (via lm_ethernetmac()), then this should be selected.
diff --git a/nuttx/configs/lm3s6965-ek/include/board.h b/nuttx/configs/lm3s6965-ek/include/board.h
index 808d009cc..112c40b7a 100644
--- a/nuttx/configs/lm3s6965-ek/include/board.h
+++ b/nuttx/configs/lm3s6965-ek/include/board.h
@@ -63,7 +63,7 @@
  * of (400 / 2) / 4 = 50MHz
  */
 
-#define LM3S_SYSDIV          4
+#define LM_SYSDIV            4
 #define SYSCLK_FREQUENCY     50000000  /* 50MHz */
 
 /* Other RCC settings:
@@ -74,7 +74,7 @@
  * - No auto-clock gating reset
  */
 
-#define LM3S_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(LM3S_SYSDIV))
+#define LM_RCC_VALUE (SYSCON_RCC_OSCSRC | SYSCON_RCC_XTAL | SYSCON_RCC_USESYSDIV | SYSCON_RCC_SYSDIV(LM_SYSDIV))
 
 /* RCC2 settings -- RCC2 not used.  Other RCC2 settings
  *
@@ -83,7 +83,7 @@
  * - Not using RCC2
  */
 
-#define LM3S_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(LM3S_SYSDIV))
+#define LM_RCC2_VALUE (SYSCON_RCC2_OSCSRC | SYSCON_RCC2_SYSDIV(LM_SYSDIV))
 
 /* LED definitions ******************************************************************/
 
@@ -115,9 +115,9 @@
  * Name: lm_boardinitialize
  *
  * Description:
- *   All LM3S architectures must provide the following entry point.  This entry point
- *   is called early in the intitialization -- after all memory has been configured
- *   and mapped but before any devices have been initialized.
+ *   All Stellaris architectures must provide the following entry point.  This entry
+ *   point is called early in the intitialization -- after all memory has been
+ *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig
index 99f2f50ab..5c288f95d 100755
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig
@@ -93,7 +93,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 
 #
-# LM3S Configuration Options
+# Stellaris Configuration Options
 #
 # CONFIG_ARCH_CHIP_LM3S6918 is not set
 # CONFIG_ARCH_CHIP_LM3S9B96 is not set
@@ -104,7 +104,7 @@ CONFIG_ARCH_CHIP_LM3S6965=y
 CONFIG_LM_DFU=y
 
 #
-# Select LM3S Peripheral Support
+# Select Stellaris Peripheral Support
 #
 CONFIG_LM_UART0=y
 # CONFIG_LM_UART1 is not set
@@ -127,7 +127,7 @@ CONFIG_LM_DISABLE_GPIOH_IRQS=y
 CONFIG_LM_DISABLE_GPIOJ_IRQS=y
 
 #
-# LM3S Ethernet Configuration
+# Stellaris Ethernet Configuration
 #
 # CONFIG_LM_ETHLEDS is not set
 # CONFIG_LM_BOARDMAC is not set
@@ -141,7 +141,7 @@ CONFIG_LM_DISABLE_GPIOJ_IRQS=y
 # CONFIG_M3S_DUMPPACKET is not set
 
 #
-# LM3S SSI Configuration
+# Stellaris SSI Configuration
 #
 CONFIG_SSI_POLLWAIT=y
 CONFIG_SSI_TXLIMIT=4
diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig
index b86d06dc9..b123800e0 100755
--- a/nuttx/configs/lm3s6965-ek/nx/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nx/defconfig
@@ -93,7 +93,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 
 #
-# LM3S Configuration Options
+# Stellaris Configuration Options
 #
 # CONFIG_ARCH_CHIP_LM3S6918 is not set
 # CONFIG_ARCH_CHIP_LM3S9B96 is not set
@@ -104,7 +104,7 @@ CONFIG_ARCH_CHIP_LM3S6965=y
 CONFIG_LM_DFU=y
 
 #
-# Select LM3S Peripheral Support
+# Select Stellaris Peripheral Support
 #
 CONFIG_LM_UART0=y
 # CONFIG_LM_UART1 is not set
@@ -127,7 +127,7 @@ CONFIG_LM_DISABLE_GPIOH_IRQS=y
 CONFIG_LM_DISABLE_GPIOJ_IRQS=y
 
 #
-# LM3S SSI Configuration
+# Stellaris SSI Configuration
 #
 CONFIG_SSI_POLLWAIT=y
 CONFIG_SSI_TXLIMIT=4
diff --git a/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig
index bc433e116..67633c916 100755
--- a/nuttx/configs/lm3s6965-ek/ostest/defconfig
+++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig
@@ -93,7 +93,7 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 
 #
-# LM3S Configuration Options
+# Stellaris Configuration Options
 #
 # CONFIG_ARCH_CHIP_LM3S6918 is not set
 # CONFIG_ARCH_CHIP_LM3S9B96 is not set
@@ -104,7 +104,7 @@ CONFIG_ARCH_CHIP_LM3S6965=y
 CONFIG_LM_DFU=y
 
 #
-# Select LM3S Peripheral Support
+# Select Stellaris Peripheral Support
 #
 CONFIG_LM_UART0=y
 # CONFIG_LM_UART1 is not set
@@ -127,7 +127,7 @@ CONFIG_LM_DISABLE_GPIOH_IRQS=y
 CONFIG_LM_DISABLE_GPIOJ_IRQS=y
 
 #
-# LM3S SSI Configuration
+# Stellaris SSI Configuration
 #
 CONFIG_SSI_POLLWAIT=y
 CONFIG_SSI_TXLIMIT=4
diff --git a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
index c2fc50df1..00d55ed40 100644
--- a/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
+++ b/nuttx/configs/lm3s6965-ek/src/lm3s6965ek_internal.h
@@ -56,12 +56,12 @@
  * expanded).
  */
 
-#if LM3S_NSSI == 0
+#if LM_NSSI == 0
 #  undef CONFIG_SSI0_DISABLE
 #  define CONFIG_SSI0_DISABLE 1
 #  undef CONFIG_SSI1_DISABLE
 #  define CONFIG_SSI1_DISABLE 1
-#elif LM3S_NSSI == 1
+#elif LM_NSSI == 1
 #  undef CONFIG_SSI1_DISABLE
 #  define CONFIG_SSI1_DISABLE 1
 #endif
diff --git a/nuttx/configs/lm3s6965-ek/src/up_boot.c b/nuttx/configs/lm3s6965-ek/src/up_boot.c
index 7ffd37f17..6229a2a59 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_boot.c
+++ b/nuttx/configs/lm3s6965-ek/src/up_boot.c
@@ -64,9 +64,10 @@
  * Name: lm_boardinitialize
  *
  * Description:
- *   All LM3S architectures must provide the following entry point.  This entry point
- *   is called early in the intitialization -- after all memory has been configured
- *   and mapped but before any devices have been initialized.
+ *   All Stellaris architectures must provide the following entry point.  This entry
+ *   point is called early in the intitialization -- after all memory has been
+ *   configured and mapped but before any devices have been initialized.
+ *
  ************************************************************************************/
 
 void lm_boardinitialize(void)
diff --git a/nuttx/configs/lm3s6965-ek/src/up_ethernet.c b/nuttx/configs/lm3s6965-ek/src/up_ethernet.c
index 2d114baaa..81d6cda26 100644
--- a/nuttx/configs/lm3s6965-ek/src/up_ethernet.c
+++ b/nuttx/configs/lm3s6965-ek/src/up_ethernet.c
@@ -80,8 +80,8 @@ void lm_ethernetmac(struct ether_addr *ethaddr)
 
   /* Get the current value of the user registers */
 
-  user0 = getreg32(LM3S_FLASH_USERREG0);
-  user1 = getreg32(LM3S_FLASH_USERREG1);
+  user0 = getreg32(LM_FLASH_USERREG0);
+  user1 = getreg32(LM_FLASH_USERREG1);
 
   nlldbg("user: %06x:%06x\n", user1 & 0x00ffffff, user0 & 0x00ffffff);
   DEBUGASSERT(user0 != 0xffffffff && user1 != 0xffffffff);