Updates for stm32f4discovery/usbnsh configuration

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

2 files changed, 22 insertions, 19 deletions

diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt
index 207ee6cde..e34168224 100644
--- a/nuttx/configs/stm32f4discovery/README.txt
+++ b/nuttx/configs/stm32f4discovery/README.txt
@@ -1235,10 +1235,11 @@ Where <subdir> is one of the following:
 
      7. USB Support (CDC/ACM device)
 
-        CONFIG_STM32_OTGFS=y      : STM32 OTG FS support
-        CONFIG_USBDEV=y           : USB device support must be enabled
-        CONFIG_CDCACM=y           : The CDC/ACM driver must be built
-        CONFIG_NSH_BUILTIN_APPS=y : NSH built-in application support must be enabled
+        CONFIG_STM32_OTGFS=y          : STM32 OTG FS support
+        CONFIG_USBDEV=y               : USB device support must be enabled
+        CONFIG_CDCACM=y               : The CDC/ACM driver must be built
+        CONFIG_NSH_BUILTIN_APPS=y     : NSH built-in application support must be enabled
+        CONFIG_NSH_ARCHINIT=y         : To perform USB initialization
 
      8. Using the USB console.
 
@@ -1246,11 +1247,12 @@ Where <subdir> is one of the following:
         (or PL2303) USB console.  The normal way that you would configure the
         the USB console would be to change the .config file like this:
 
-        CONFIG_STM32_OTGFS=y      : STM32 OTG FS support
-        CONFIG_DEV_CONSOLE=n      : Inhibit use of /dev/console by other logic
-        CONFIG_USBDEV=y           : USB device support must be enabled
-        CONFIG_CDCACM=y           : The CDC/ACM driver must be built
-        CONFIG_CDCACM_CONSOLE=y   : Enable the CDC/ACM USB console.
+        CONFIG_STM32_OTGFS=y           : STM32 OTG FS support
+        CONFIG_USART2_SERIAL_CONSOLE=n : Disable the USART2 console
+        CONFIG_DEV_CONSOLE=n           : Inhibit use of /dev/console by other logic
+        CONFIG_USBDEV=y                : USB device support must be enabled
+        CONFIG_CDCACM=y                : The CDC/ACM driver must be built
+        CONFIG_CDCACM_CONSOLE=y        : Enable the CDC/ACM USB console.
 
         However, that configuration does not work.  It fails early probably because
         of some dependency on /dev/console before the USB connection is established.
@@ -1260,11 +1262,12 @@ Where <subdir> is one of the following:
         but this version will will use /dev/console.  Instead, it will use the
         normal /dev/ttyACM0 USB serial device for the console:
 
-        CONFIG_STM32_OTGFS=y      : STM32 OTG FS support
-        CONFIG_USBDEV=y           : USB device support must be enabled
-        CONFIG_CDCACM=y           : The CDC/ACM driver must be built
-        CONFIG_CDCACM_CONSOLE=n   : Done use the CDC/ACM USB console.
-        CONFIG_NSH_USBCONSOLE=y   : Instead use some other USB device for the console
+        CONFIG_STM32_OTGFS=y           : STM32 OTG FS support
+        CONFIG_USART2_SERIAL_CONSOLE=n : Disable the USART2 console
+        CONFIG_USBDEV=y                : USB device support must be enabled
+        CONFIG_CDCACM=y                : The CDC/ACM driver must be built
+        CONFIG_CDCACM_CONSOLE=n        : Don't use the CDC/ACM USB console.
+        CONFIG_NSH_USBCONSOLE=y        : Instead use some other USB device for the console
 
         The particular USB device that is used is:
 
diff --git a/nuttx/configs/stm32f4discovery/usbnsh/defconfig b/nuttx/configs/stm32f4discovery/usbnsh/defconfig
index 3ddcab424..534445f01 100644
--- a/nuttx/configs/stm32f4discovery/usbnsh/defconfig
+++ b/nuttx/configs/stm32f4discovery/usbnsh/defconfig
@@ -292,7 +292,7 @@ CONFIG_TASK_NAME_SIZE=0
 CONFIG_START_YEAR=2013
 CONFIG_START_MONTH=1
 CONFIG_START_DAY=27
-CONFIG_DEV_CONSOLE=y
+# CONFIG_DEV_CONSOLE is not set
 # CONFIG_MUTEX_TYPES is not set
 # CONFIG_PRIORITY_INHERITANCE is not set
 # CONFIG_FDCLONE_DISABLE is not set
@@ -406,19 +406,19 @@ CONFIG_USBDEV_SELFPOWERED=y
 CONFIG_CDCACM=y
 CONFIG_CDCACM_CONSOLE=y
 CONFIG_CDCACM_EP0MAXPACKET=64
-CONFIG_CDCACM_EPINTIN=2
+CONFIG_CDCACM_EPINTIN=1
 CONFIG_CDCACM_EPINTIN_FSSIZE=64
 CONFIG_CDCACM_EPINTIN_HSSIZE=64
-CONFIG_CDCACM_EPBULKOUT=0
+CONFIG_CDCACM_EPBULKOUT=3
 CONFIG_CDCACM_EPBULKOUT_FSSIZE=64
 CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
-CONFIG_CDCACM_EPBULKIN=0
+CONFIG_CDCACM_EPBULKIN=2
 CONFIG_CDCACM_EPBULKIN_FSSIZE=64
 CONFIG_CDCACM_EPBULKIN_HSSIZE=512
 CONFIG_CDCACM_NWRREQS=4
 CONFIG_CDCACM_NRDREQS=4
 CONFIG_CDCACM_RXBUFSIZE=256
-# CONFIG_CDCACM_TXBUFSIZE is not set
+CONFIG_CDCACM_TXBUFSIZE=256
 CONFIG_CDCACM_VENDORID=0x0525
 CONFIG_CDCACM_PRODUCTID=0xa4a7
 CONFIG_CDCACM_VENDORSTR="NuttX"