LPC43 update

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5001 7fd9a85b-ad96-42d3-883c-3090e2eb8679

9 files changed, 48 insertions, 9 deletions

diff --git a/nuttx/TODO b/nuttx/TODO
index b3c4126ba..303950a08 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated August 1, 2012)
+NuttX TODO List (Last updated August 3, 2012)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This file summarizes known NuttX bugs, limitations, inconsistencies with 
@@ -1843,6 +1843,27 @@ o NuttShell (NSH) (apps/nshlib)
   Status:      Open
   Priority:    Low (enhancement)
 
+  Title:       MOUNT w/NO PARAMETERS
+  Description: Feature request: "A 'mount' without arguments should probably list
+               mounted filesystems as in Linux. 
+
+               nsh> mount
+               nsh_romfsimg on /etc type romfs (ro)
+               /dev/mtdblock0 on /home type vfat (rw)
+  Status:      Open
+  Priority:    Low (enhancement)
+
+  Title:       DF COMMAND
+  Description: Feature request: "It would be convenient to list the free space
+               on a filesystem with something like 'df'.
+
+               nsh> df
+               Filesystem           1K-blocks      Used Available Use% Mounted on
+               nsh_romfsimg                 8         8         0 100% /etc
+               /dev/mtdblock0            3584        16      3568   1% /home
+  Status:      Open
+  Priority:    Low (enhancement)
+
 o System libraries apps/system (apps/system)
   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/arch/arm/src/lpc43xx/lpc43_uart.c b/nuttx/arch/arm/src/lpc43xx/lpc43_uart.c
index f03054695..4491830f9 100644
--- a/nuttx/arch/arm/src/lpc43xx/lpc43_uart.c
+++ b/nuttx/arch/arm/src/lpc43xx/lpc43_uart.c
@@ -275,7 +275,7 @@ void lpc43_usart0_reset(void)
 #endif
 
 #ifdef CONFIG_LPC43_UART1
-EXTERN void lpc43_uart1_reset(void)
+void lpc43_uart1_reset(void)
 {
   putreg32(RGU_CTRL1_UART1_RST, LPC43_RGU_CTRL1);
 }
diff --git a/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt
index 82bb42e1d..a5c0709ea 100644
--- a/nuttx/configs/lpc4330-xplorer/README.txt
+++ b/nuttx/configs/lpc4330-xplorer/README.txt
@@ -901,6 +901,16 @@ Where <subdir> is one of the following:
       CONFIG_BOOT_SRAM=y             : Executing in SRAM
       CONFIG_LPC32_CODEREDW=y        : Code Red under Windows
 
+    To execute from SRAM, you would need to set:
+
+      CONFIG_BOOT_SPIFI=y            : Executing from SPIFI
+      CONFIG_DRAM_SIZE=(128*1024)    : SRAM Bank0 size
+      CONFIG_DRAM_START=0x10000000   : SRAM Bank0 base address
+      CONFIG_SPIFI_OFFSET=(128*1024) : SPIFI file system offset
+
+    CONFIG_MM_REGIONS should also be increased if you want to other SRAM banks
+    to the memory pool.
+
     This configuration has some special options that can be used to
     create a block device on the SPIFI FLASH.  NOTE:  CONFIG_LPC43_SPIFI=y
     must also be defined to enable SPIFI setup support:
@@ -923,7 +933,7 @@ Where <subdir> is one of the following:
       CONFIG_SPIFI_READONLY - Define to support only read-only operations.
       CONFIG_SPIFI_LIBRARY - Don't use the LPC43xx ROM routines but, instead,
         use an external library implementation of the SPIFI interface.
-      CONFIG_SPIFI_VERIFY - Verify all spi_program() operations by reading
+      CONFIG_SPIFI_VERIFY - Verify all spifi_program() operations by reading
         from the SPI address space after each write.
       CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers.  You
         probably do not want to enable this unless you want to dig through a
diff --git a/nuttx/configs/lpc4330-xplorer/include/board.h b/nuttx/configs/lpc4330-xplorer/include/board.h
index be59b40da..bf4c355e5 100644
--- a/nuttx/configs/lpc4330-xplorer/include/board.h
+++ b/nuttx/configs/lpc4330-xplorer/include/board.h
@@ -193,7 +193,7 @@
 #define BOARD_UART1_BASEFREQ        BOARD_XTAL_FREQUENCY
 
 #define BOARD_USART2_CLKSRC         BASE_USART2_CLKSEL_XTAL
-#define BOARD_USART3_BASEFREQ       BOARD_XTAL_FREQUENCY
+#define BOARD_USART2_BASEFREQ       BOARD_XTAL_FREQUENCY
 
 #define BOARD_USART3_CLKSRC         BASE_USART3_CLKSEL_XTAL
 #define BOARD_USART3_BASEFREQ       BOARD_XTAL_FREQUENCY
@@ -266,6 +266,14 @@
 #define PINCONF_U1_TXD  PINCONF_U1_TXD_1
 #define PINCONF_U1_RXD  PINCONF_U1_RXD_1
 
+#define PINCONF_U2_TXD  PINCONF_U2_TXD_1
+#define PINCONF_U2_RXD  PINCONF_U2_RXD_1
+#define PINCONF_U2_DIR  PINCONF_U2_DIR_1
+
+#define PINCONF_U3_TXD  PINCONF_U3_TXD_2
+#define PINCONF_U3_RXD  PINCONF_U3_RXD_2
+#define PINCONF_U3_DIR  PINCONF_U3_DIR_2
+
 /****************************************************************************
  * Public Types
  ****************************************************************************/
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
index 7f2bb2bdf..5952d8ef6 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
+++ b/nuttx/configs/lpc4330-xplorer/nsh/Make.defs
@@ -104,7 +104,7 @@ ifeq ($(CONFIG_BOOT_SRAM),y)
   LDSCRIPT = ramconfig.ld
 endif
 ifeq ($(CONFIG_BOOT_SPIFI),y)
-  LDSCRIPT = spiconfig.ld
+  LDSCRIPT = spificonfig.ld
 endif
 ifeq ($(CONFIG_BOOT_FLASHA),y)
   LDSCRIPT = flashaconfig.ld
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/defconfig b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
index 53857c81a..d168a947a 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/defconfig
+++ b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
@@ -696,7 +696,7 @@ CONFIG_MMCSD_HAVECARDDETECT=n
 #   CONFIG_SPIFI_READONLY - Define to support only read-only operations.
 #   CONFIG_SPIFI_LIBRARY - Don't use the LPC43xx ROM routines but, instead,
 #     use an external library implementation of the SPIFI interface.
-#   CONFIG_SPIFI_VERIFY - Verify all spi_program() operations by reading
+#   CONFIG_SPIFI_VERIFY - Verify all spifi_program() operations by reading
 #     from the SPI address space after each write.
 #   CONFIG_DEBUG_SPIFI_DUMP - Debug option to dump read/write buffers.  You
 #     probably do not want to enable this unless you want to dig through a
diff --git a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
index 7f2bb2bdf..5952d8ef6 100644
--- a/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
+++ b/nuttx/configs/lpc4330-xplorer/ostest/Make.defs
@@ -104,7 +104,7 @@ ifeq ($(CONFIG_BOOT_SRAM),y)
   LDSCRIPT = ramconfig.ld
 endif
 ifeq ($(CONFIG_BOOT_SPIFI),y)
-  LDSCRIPT = spiconfig.ld
+  LDSCRIPT = spificonfig.ld
 endif
 ifeq ($(CONFIG_BOOT_FLASHA),y)
   LDSCRIPT = flashaconfig.ld
diff --git a/nuttx/configs/lpc4330-xplorer/scripts/spificonfig.ld b/nuttx/configs/lpc4330-xplorer/scripts/spificonfig.ld
index 7bbb3d295..1b8df48b2 100644
--- a/nuttx/configs/lpc4330-xplorer/scripts/spificonfig.ld
+++ b/nuttx/configs/lpc4330-xplorer/scripts/spificonfig.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/lpc4330-xplorer/scripts/spiconfig.ld
+ * configs/lpc4330-xplorer/scripts/spificonfig.ld
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/lpc4330-xplorer/src/Makefile b/nuttx/configs/lpc4330-xplorer/src/Makefile
index f2a5966d4..30e429bce 100644
--- a/nuttx/configs/lpc4330-xplorer/src/Makefile
+++ b/nuttx/configs/lpc4330-xplorer/src/Makefile
@@ -77,7 +77,7 @@ CSRCS		+= $(SPIFI_LIB)/spifi_rom_api.c
 #CSRCS		+= $(SPIFI_LIB)/numonyx.c
 CSRCS		+= $(SPIFI_LIB)/spansion.c
 #CSRCS		+= $(SPIFI_LIB)/sst.c
-#CSRCS		+= $(SPIFI_LIB)/winbond.c
+CSRCS		+= $(SPIFI_LIB)/winbond.c
 endif
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))