lm3s6918 update

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

3 files changed, 28 insertions, 20 deletions

diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt
index eefd0e18a..b73714aea 100644
--- a/nuttx/configs/eagle100/README.txt
+++ b/nuttx/configs/eagle100/README.txt
@@ -79,7 +79,11 @@ Eagle100-specific Configuration Options
 
 	CONFIG_DRAM_START - The start address of installed DRAM
 
-	   CONFIG_DRAM_SIZE=0x00000000
+	   CONFIG_DRAM_START=0x20000000
+
+	CONFIG_DRAM_END - Last address+1 of installed RAM
+
+	   CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE)
 
 	CONFIG_ARCH_LEDS - Use LEDs to show state. Unique to boards that
 	   have LEDs
diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig
index d88d1e924..d686306bc 100644
--- a/nuttx/configs/eagle100/ostest/defconfig
+++ b/nuttx/configs/eagle100/ostest/defconfig
@@ -49,6 +49,7 @@
 # CONFIG_BOARD_LOOPSPERMSEC - for delay loops
 # CONFIG_DRAM_SIZE - Describes the installed DRAM.
 # CONFIG_DRAM_START - The start address of DRAM (physical)
+# CONFIG_DRAM_END - Last address+1 of installed RAM
 # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
 #   stack. If defined, this symbol is the size of the interrupt
 #   stack in bytes.  If not defined, the user task stacks will be
@@ -66,6 +67,7 @@ CONFIG_ARCH_BOARD_EAGLE100=y
 CONFIG_BOARD_LOOPSPERMSEC=16945
 CONFIG_DRAM_SIZE=0x00010000
 CONFIG_DRAM_START=0x00000000
+CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE)
 CONFIG_DRAM_NUTTXENTRY=0x00002000
 CONFIG_ARCH_INTERRUPTSTACK=n
 CONFIG_ARCH_STACKDUMP=y
@@ -78,7 +80,7 @@ CONFIG_ARCH_LEDS=y
 # CONFIG_UARTn_DISABLE - select to disable all support for
 #   the UART
 # CONFIG_UARTn_SERIAL_CONSOLE - selects the UARTn for the
-#   console and ttys0 (default is the UART1).
+#   console and ttys0 (default is the UART0).
 # CONFIG_UARTn_RXBUFSIZE - Characters are buffered as received.
 #   This specific the size of the receive buffer
 # CONFIG_UARTn_TXBUFSIZE - Characters are buffered before
@@ -88,30 +90,22 @@ CONFIG_ARCH_LEDS=y
 # CONFIG_UARTn_PARTIY - 0=no parity, 1=odd parity, 2=even parity
 # CONFIG_UARTn_2STOP - Two stop bits
 #
-CONFIG_UART1_DISABLE=n
-CONFIG_UART2_DISABLE=y
-CONFIG_UART3_DISABLE=y
-CONFIG_UART1_SERIAL_CONSOLE=y
-CONFIG_UART2_SERIAL_CONSOLE=n
-CONFIG_UART3_SERIAL_CONSOLE=n
+CONFIG_UART0_DISABLE=n
+CONFIG_UART1_DISABLE=y
+CONFIG_UART0_SERIAL_CONSOLE=y
+CONFIG_UART1_SERIAL_CONSOLE=n
+CONFIG_UART0_TXBUFSIZE=256
 CONFIG_UART1_TXBUFSIZE=256
-CONFIG_UART2_TXBUFSIZE=256
-CONFIG_UART3_TXBUFSIZE=256
+CONFIG_UART0_RXBUFSIZE=256
 CONFIG_UART1_RXBUFSIZE=256
-CONFIG_UART2_RXBUFSIZE=256
-CONFIG_UART3_RXBUFSIZE=256
+CONFIG_UART0_BAUD=115200
 CONFIG_UART1_BAUD=115200
-CONFIG_UART2_BAUD=115200
-CONFIG_UART3_BAUD=115200
+CONFIG_UART0_BITS=8
 CONFIG_UART1_BITS=8
-CONFIG_UART2_BITS=8
-CONFIG_UART3_BITS=8
+CONFIG_UART0_PARITY=0
 CONFIG_UART1_PARITY=0
-CONFIG_UART2_PARITY=0
-CONFIG_UART3_PARITY=0
+CONFIG_UART0_2STOP=0
 CONFIG_UART1_2STOP=0
-CONFIG_UART2_2STOP=0
-CONFIG_UART3_2STOP=0
 
 #
 # LM3S6918 specific SPI device driver settings
@@ -122,6 +116,12 @@ CONFIG_SPI1_DISABLE=n
 CONFIG_SPI2_DISABLE=y
 
 #
+# LM3S6918 specific serial device driver settings
+#
+CONFIG_LM3S_ETHERNET=n
+CONFIG_LM3S_ETHLEDS=n
+
+#
 # General build options
 #
 # CONFIG_RRLOAD_BINARY - make the rrload binary format used with
diff --git a/nuttx/configs/eagle100/src/up_leds.c b/nuttx/configs/eagle100/src/up_leds.c
index 2b8dcfb6b..bf23b1eaa 100644
--- a/nuttx/configs/eagle100/src/up_leds.c
+++ b/nuttx/configs/eagle100/src/up_leds.c
@@ -70,6 +70,10 @@
 #ifdef CONFIG_ARCH_LEDS
 void up_ledinit(void)
 {
+  /* Make sure that the GPIOE peripheral is enabled */
+
+  modifyreg32(LM3S_SYSCON_RCGC2_OFFSET, 0, SYSCON_RCGC2_GPIOE);
+
   /* Configure Port E, Bit 1 as an output, initial value=OFF */
 
   lm3s_configgpio(GPIO_DIR_OUTPUT | GPIO_VALUE_ZERO | GPIO_PORTE | 1);