Updated spark configuration from David Sidrane

3 files changed, 62 insertions, 43 deletions

diff --git a/nuttx/configs/spark/composite/defconfig b/nuttx/configs/spark/composite/defconfig
index eb87a0efb..63d165d5e 100644
--- a/nuttx/configs/spark/composite/defconfig
+++ b/nuttx/configs/spark/composite/defconfig
@@ -25,7 +25,7 @@ CONFIG_HOST_LINUX=y
 # CONFIG_RRLOAD_BINARY is not set
 CONFIG_INTELHEX_BINARY=y
 # CONFIG_MOTOROLA_SREC is not set
-# CONFIG_RAW_BINARY is not set
+CONFIG_RAW_BINARY=y
 
 #
 # Customize Header Files
@@ -38,7 +38,7 @@ CONFIG_INTELHEX_BINARY=y
 #
 # Debug Options
 #
-CONFIG_DEBUG=y
+# CONFIG_DEBUG is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_DEBUG_VERBOSE is not set
 
@@ -177,6 +177,7 @@ CONFIG_ARCH_CHIP_STM32F103CB=y
 # CONFIG_ARCH_CHIP_STM32F105VBT7 is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 # CONFIG_ARCH_CHIP_STM32F207IG is not set
+# CONFIG_ARCH_CHIP_STM32F207ZE is not set
 # CONFIG_ARCH_CHIP_STM32F302CB is not set
 # CONFIG_ARCH_CHIP_STM32F302CC is not set
 # CONFIG_ARCH_CHIP_STM32F302RB is not set
@@ -263,12 +264,14 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 CONFIG_STM32_DISABLE_IDLE_SLEEP_DURING_DEBUG=y
 # CONFIG_STM32_FORCEPOWER is not set
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
+# CONFIG_STM32_DMACAPABLE is not set
 CONFIG_STM32_USART=y
 
 #
 # U[S]ART Configuration
 #
 # CONFIG_USART2_RS485 is not set
+# CONFIG_USART2_RXDMA is not set
 # CONFIG_SERIAL_DISABLE_REORDERING is not set
 # CONFIG_STM32_USART_SINGLEWIRE is not set
 
@@ -308,7 +311,7 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
 CONFIG_BOARD_LOOPSPERMSEC=5483
 # CONFIG_ARCH_CALIBRATION is not set
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
-CONFIG_ARCH_INTERRUPTSTACK=512
+CONFIG_ARCH_INTERRUPTSTACK=340
 
 #
 # Boot options
@@ -374,14 +377,8 @@ CONFIG_SDCLONE_DISABLE=y
 # CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 # CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="conn_main"
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_ENVIRON is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+# CONFIG_DISABLE_OS_API is not set
 
 #
 # Signal Numbers
@@ -390,7 +387,6 @@ CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
 CONFIG_SIG_SIGCONDTIMEDOUT=16
-CONFIG_SIG_SIGWORK=17
 
 #
 # Sizes of configurable things (0 disables)
@@ -410,10 +406,10 @@ CONFIG_PREALLOC_TIMERS=2
 #
 # Stack and heap information
 #
-CONFIG_IDLETHREAD_STACKSIZE=256
-CONFIG_USERMAIN_STACKSIZE=704
+CONFIG_IDLETHREAD_STACKSIZE=280
+CONFIG_USERMAIN_STACKSIZE=1024
 CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=300
+CONFIG_PTHREAD_STACK_DEFAULT=340
 
 #
 # Device Drivers
@@ -515,7 +511,7 @@ CONFIG_USBDEV_MAXPOWER=100
 # CONFIG_USBDEV_DMA is not set
 CONFIG_USBDEV_TRACE=y
 CONFIG_USBDEV_TRACE_NRECORDS=32
-# CONFIG_USBDEV_TRACE_STRINGS is not set
+CONFIG_USBDEV_TRACE_STRINGS=y
 
 #
 # USB Device Class Driver Options
@@ -542,15 +538,15 @@ CONFIG_CDCACM_EPINTIN_FSSIZE=64
 CONFIG_CDCACM_EPINTIN_HSSIZE=64
 CONFIG_CDCACM_EPBULKOUT=3
 CONFIG_CDCACM_EPBULKOUT_FSSIZE=64
-CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
+CONFIG_CDCACM_EPBULKOUT_HSSIZE=64
 CONFIG_CDCACM_EPBULKIN=2
 CONFIG_CDCACM_EPBULKIN_FSSIZE=64
-CONFIG_CDCACM_EPBULKIN_HSSIZE=512
-CONFIG_CDCACM_NWRREQS=4
-CONFIG_CDCACM_NRDREQS=4
+CONFIG_CDCACM_EPBULKIN_HSSIZE=64
+CONFIG_CDCACM_NWRREQS=2
+CONFIG_CDCACM_NRDREQS=2
 CONFIG_CDCACM_BULKIN_REQLEN=96
-CONFIG_CDCACM_RXBUFSIZE=256
-CONFIG_CDCACM_TXBUFSIZE=256
+CONFIG_CDCACM_RXBUFSIZE=96
+CONFIG_CDCACM_TXBUFSIZE=96
 CONFIG_CDCACM_VENDORID=0x0525
 CONFIG_CDCACM_PRODUCTID=0xa4a7
 CONFIG_CDCACM_VENDORSTR="NuttX"
@@ -564,13 +560,13 @@ CONFIG_USBMSC_EPBULKOUT=4
 CONFIG_USBMSC_EPBULKIN=5
 CONFIG_USBMSC_NWRREQS=2
 CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBMSC_BULKINREQLEN=256
-CONFIG_USBMSC_BULKOUTREQLEN=256
+CONFIG_USBMSC_BULKINREQLEN=64
+CONFIG_USBMSC_BULKOUTREQLEN=64
 CONFIG_USBMSC_VENDORID=0x584e
 CONFIG_USBMSC_VENDORSTR="NuttX"
 CONFIG_USBMSC_PRODUCTID=0x5342
-CONFIG_USBMSC_PRODUCTSTR="USBdev Storage"
-CONFIG_USBMSC_VERSIONNO=0x0399
+CONFIG_USBMSC_PRODUCTSTR="Mass Storage"
+CONFIG_USBMSC_VERSIONNO=0x399
 # CONFIG_USBMSC_REMOVABLE is not set
 # CONFIG_USBHOST is not set
 CONFIG_WIRELESS=y
@@ -581,6 +577,10 @@ CONFIG_CC3000_SPIDEV=2
 CONFIG_CC3000_DEVMINOR=0
 CONFIG_CC3000_SPI_MODE=0
 CONFIG_CC3000_SPI_FREQUENCY=16000000
+CONFIG_CC3000_WORKER_STACKSIZE=240
+CONFIG_CC3000_SELECT_STACKSIZE=390
+CONFIG_CC3000_UNSOLICED_STACKSIZE=264
+# CONFIG_CC3000_PROBES is not set
 # CONFIG_WL_NRF24L01 is not set
 
 #
@@ -617,6 +617,7 @@ CONFIG_FS_FATTIME=y
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_SMARTFS is not set
+# CONFIG_FS_BINFS is not set
 
 #
 # System Logging
@@ -673,8 +674,8 @@ CONFIG_LIB_RAND_ORDER=2
 # CONFIG_EOL_IS_BOTH_CRLF is not set
 CONFIG_EOL_IS_EITHER_CRLF=y
 # CONFIG_LIBC_EXECFUNCS is not set
-CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
-CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=768
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
@@ -702,6 +703,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=0
 #
 # Built-In Applications
 #
+CONFIG_BUILTIN_PROXY_STACKSIZE=768
 
 #
 # Examples
@@ -738,7 +740,6 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PASHELLO is not set
 # CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_POLL is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
 # CONFIG_EXAMPLES_QENCODER is not set
 # CONFIG_EXAMPLES_RGMP is not set
@@ -746,6 +747,7 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
 # CONFIG_EXAMPLES_SMART is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
@@ -853,7 +855,7 @@ CONFIG_NSH_BUILTIN_APPS=y
 # CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=0
 CONFIG_NSH_FILEIOSIZE=128
-CONFIG_NSH_LINELEN=40
+CONFIG_NSH_LINELEN=80
 CONFIG_NSH_MAXARGUMENTS=6
 CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set
diff --git a/nuttx/configs/spark/src/up_composite.c b/nuttx/configs/spark/src/up_composite.c
index 12c481868..0c7a2ee96 100644
--- a/nuttx/configs/spark/src/up_composite.c
+++ b/nuttx/configs/spark/src/up_composite.c
@@ -133,22 +133,18 @@
 #endif
 
 /****************************************************************************
- * Private Data
+ * Private Functions
  ****************************************************************************/
 
 /****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nsh_archinitialize
+ * Name: do_composite_archinitialize
  *
  * Description:
  *   Perform architecture specific initialization
  *
  ****************************************************************************/
 
-int composite_archinitialize(void)
+static int do_composite_archinitialize(void)
 {
 #ifdef HAVE_SST25
   FAR struct spi_dev_s *spi;
@@ -299,3 +295,24 @@ int composite_archinitialize(void)
 
   return OK;
 }
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nsh_archinitialize
+ *
+ * Description:
+ *   Perform architecture specific initialization
+ *
+ ****************************************************************************/
+
+int composite_archinitialize(void)
+{
+#if defined(CONFIG_NSH_ARCHINIT)
+  return OK;
+#else
+  return do_composite_archinitialize();
+#endif
+}
diff --git a/nuttx/configs/spark/usbmsc/defconfig b/nuttx/configs/spark/usbmsc/defconfig
index 468ddccb8..29fc171fe 100644
--- a/nuttx/configs/spark/usbmsc/defconfig
+++ b/nuttx/configs/spark/usbmsc/defconfig
@@ -503,8 +503,8 @@ CONFIG_USBMSC_EPBULKOUT=2
 CONFIG_USBMSC_EPBULKIN=3
 CONFIG_USBMSC_NWRREQS=2
 CONFIG_USBMSC_NRDREQS=2
-CONFIG_USBMSC_BULKINREQLEN=512
-CONFIG_USBMSC_BULKOUTREQLEN=512
+CONFIG_USBMSC_BULKINREQLEN=64
+CONFIG_USBMSC_BULKOUTREQLEN=64
 CONFIG_USBMSC_VENDORID=0x584e
 CONFIG_USBMSC_VENDORSTR="NuttX"
 CONFIG_USBMSC_PRODUCTID=0x5342
@@ -617,8 +617,8 @@ CONFIG_LIB_RAND_ORDER=2
 # CONFIG_EOL_IS_BOTH_CRLF is not set
 CONFIG_EOL_IS_EITHER_CRLF=y
 # CONFIG_LIBC_EXECFUNCS is not set
-CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
-CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=768
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=768
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
@@ -797,8 +797,8 @@ CONFIG_NSH_BUILTIN_APPS=y
 #
 # CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=0
-CONFIG_NSH_FILEIOSIZE=60
-CONFIG_NSH_LINELEN=40
+CONFIG_NSH_FILEIOSIZE=128
+CONFIG_NSH_LINELEN=80
 CONFIG_NSH_MAXARGUMENTS=6
 CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT is not set