LP43xx SPIFI MTD driver update

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

3 files changed, 33 insertions, 2 deletions

diff --git a/nuttx/configs/lpc4330-xplorer/README.txt b/nuttx/configs/lpc4330-xplorer/README.txt
index bbe954bea..783461704 100644
--- a/nuttx/configs/lpc4330-xplorer/README.txt
+++ b/nuttx/configs/lpc4330-xplorer/README.txt
@@ -926,6 +926,12 @@ 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
+        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
+        *lot* of debug output!  Also required CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE,
+        and CONFIG_DEBUG_FS,
 
     In my experience, there were some missing function pointers in the LPC43xx
     SPIFI ROM routines and the SPIFI configuration could only be built with
diff --git a/nuttx/configs/lpc4330-xplorer/nsh/defconfig b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
index 27c434d53..7ecb76efd 100644
--- a/nuttx/configs/lpc4330-xplorer/nsh/defconfig
+++ b/nuttx/configs/lpc4330-xplorer/nsh/defconfig
@@ -674,7 +674,7 @@ CONFIG_MMCSD_MMCSUPPORT=n
 CONFIG_MMCSD_HAVECARDDETECT=n
 
 #
-# The SPIFI drvier has some special options that can be used to
+# The SPIFI driver has some special options that can be used to
 # create an MTD device on the SPIFI FLASH.  NOTE:  CONFIG_LPC43_SPIFI=y
 # must also be defined to enable SPIFI setup support:
 #
@@ -696,13 +696,20 @@ 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
+#     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
+#     *lot* of debug output!  Also required CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE,
+#     and CONFIG_DEBUG_FS,#
 #
 CONFIG_SPIFI_OFFSET=0
 CONFIG_SPIFI_BLKSIZE=4096
 CONFIG_SPIFI_SECTOR512=y
 CONFIG_SPIFI_RDONLY=n
 CONFIG_SPIFI_LIBRARY=n
-
+CONFIG_SPIFI_VERIFY=n
+CONFIG_DEBUG_SPIFI_DUMP=n
 # TCP/IP and UDP support via uIP
 # CONFIG_NET - Enable or disable all network features
 # CONFIG_NET_IPv6 - Build in support for IPv6
diff --git a/nuttx/configs/lpc4330-xplorer/src/Makefile b/nuttx/configs/lpc4330-xplorer/src/Makefile
index 7be95126b..f2a5966d4 100644
--- a/nuttx/configs/lpc4330-xplorer/src/Makefile
+++ b/nuttx/configs/lpc4330-xplorer/src/Makefile
@@ -62,6 +62,24 @@ ifeq ($(CONFIG_USBMSC),y)
 CSRCS		+= up_usbmsc.c
 endif
 
+ifeq ($(CONFIG_SPIFI_LIBRARY),y)
+CFLAGS		+= -DEUROBIRD
+SPIFI_LIB	= spifi_lib
+CSRCS		+= $(SPIFI_LIB)/spifi_rom_api.c
+#CSRCS		+= $(SPIFI_LIB)/amic.c
+#CSRCS		+= $(SPIFI_LIB)/atmel.c
+#CSRCS		+= $(SPIFI_LIB)/chi.c
+#CSRCS		+= $(SPIFI_LIB)/eon.c
+#CSRCS		+= $(SPIFI_LIB)/esmt.c
+#CSRCS		+= $(SPIFI_LIB)/esmt.c
+#CSRCS		+= $(SPIFI_LIB)/giga.c
+#CSRCS		+= $(SPIFI_LIB)/macronix.c
+#CSRCS		+= $(SPIFI_LIB)/numonyx.c
+CSRCS		+= $(SPIFI_LIB)/spansion.c
+#CSRCS		+= $(SPIFI_LIB)/sst.c
+#CSRCS		+= $(SPIFI_LIB)/winbond.c
+endif
+
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))