From 784a1b859e78a26c87c880f8e9f01997489ad249 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 1 Nov 2013 11:40:19 -0600 Subject: Updates to sparck configuration from David Sidrane --- nuttx/configs/spark/composite/defconfig | 4 +-- nuttx/configs/spark/nsh/defconfig | 13 ++++--- nuttx/configs/spark/src/up_nsh.c | 4 +++ nuttx/configs/spark/usbmsc/defconfig | 62 +++++++++------------------------ nuttx/configs/spark/usbnsh/defconfig | 24 ++++++------- 5 files changed, 43 insertions(+), 64 deletions(-) (limited to 'nuttx/configs/spark') diff --git a/nuttx/configs/spark/composite/defconfig b/nuttx/configs/spark/composite/defconfig index da955e13e..c17cb5ddc 100644 --- a/nuttx/configs/spark/composite/defconfig +++ b/nuttx/configs/spark/composite/defconfig @@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y # # Build Configuration # -CONFIG_APPS_DIR="../apps" +# CONFIG_APPS_DIR="../apps" # CONFIG_BUILD_2PASS is not set # @@ -361,7 +361,7 @@ CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=8 # CONFIG_SCHED_HAVE_PARENT is not set # CONFIG_JULIAN_TIME is not set -CONFIG_START_YEAR=2009 +CONFIG_START_YEAR=2013 CONFIG_START_MONTH=11 CONFIG_START_DAY=30 CONFIG_DEV_CONSOLE=y diff --git a/nuttx/configs/spark/nsh/defconfig b/nuttx/configs/spark/nsh/defconfig index 370cfab2c..ce12f1a50 100644 --- a/nuttx/configs/spark/nsh/defconfig +++ b/nuttx/configs/spark/nsh/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 @@ -154,6 +154,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 @@ -341,9 +342,9 @@ CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=8 # CONFIG_SCHED_HAVE_PARENT is not set # CONFIG_JULIAN_TIME is not set -CONFIG_START_YEAR=2009 -CONFIG_START_MONTH=10 -CONFIG_START_DAY=23 +CONFIG_START_YEAR=2013 +CONFIG_START_MONTH=11 +CONFIG_START_DAY=30 CONFIG_DEV_CONSOLE=y # CONFIG_MUTEX_TYPES is not set # CONFIG_PRIORITY_INHERITANCE is not set @@ -554,6 +555,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=368 +CONFIG_CC3000_UNSOLICED_STACKSIZE=264 +# CONFIG_CC3000_PROBES is not set # CONFIG_WL_NRF24L01 is not set # diff --git a/nuttx/configs/spark/src/up_nsh.c b/nuttx/configs/spark/src/up_nsh.c index 91b677a71..1fb2b4846 100644 --- a/nuttx/configs/spark/src/up_nsh.c +++ b/nuttx/configs/spark/src/up_nsh.c @@ -302,5 +302,9 @@ int nsh_archinitialize(void) int usbmsc_archinitialize(void) { +#if defined(CONFIG_NSH_ARCHINIT) + return OK; +#else return nsh_archinitialize(); +#endif } diff --git a/nuttx/configs/spark/usbmsc/defconfig b/nuttx/configs/spark/usbmsc/defconfig index 7e57ac98e..6398db7d0 100644 --- a/nuttx/configs/spark/usbmsc/defconfig +++ b/nuttx/configs/spark/usbmsc/defconfig @@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y # # Build Configuration # -CONFIG_APPS_DIR="../apps" +# CONFIG_APPS_DIR="../apps" # CONFIG_BUILD_2PASS is not set # @@ -38,34 +38,9 @@ CONFIG_RAW_BINARY=y # # Debug Options # -CONFIG_DEBUG=y +# CONFIG_DEBUG is not set CONFIG_ARCH_HAVE_STACKCHECK=y -# CONFIG_DEBUG_VERBOSE is not set - -# -# Subsystem Debug Options -# -# CONFIG_DEBUG_MM is not set -# CONFIG_DEBUG_SCHED is not set -# CONFIG_DEBUG_NET is not set -# CONFIG_DEBUG_USB is not set -CONFIG_DEBUG_FS=y -# CONFIG_DEBUG_LIB is not set -# CONFIG_DEBUG_BINFMT is not set -# CONFIG_DEBUG_GRAPHICS is not set -# CONFIG_DEBUG_IRQ is not set -CONFIG_DEBUG_STACK=y - -# -# Driver Debug Options -# -# CONFIG_DEBUG_LEDS is not set -# CONFIG_DEBUG_ANALOG is not set -# CONFIG_DEBUG_SPI is not set -# CONFIG_DEBUG_GPIO is not set -# CONFIG_DEBUG_DMA is not set -# CONFIG_DEBUG_AUDIO is not set -CONFIG_DEBUG_SYMBOLS=y +# CONFIG_DEBUG_SYMBOLS is not set # # System Type @@ -313,7 +288,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=234 # # Boot options @@ -367,7 +342,7 @@ CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=8 # CONFIG_SCHED_HAVE_PARENT is not set # CONFIG_JULIAN_TIME is not set -CONFIG_START_YEAR=2009 +CONFIG_START_YEAR=2013 CONFIG_START_MONTH=11 CONFIG_START_DAY=30 CONFIG_DEV_CONSOLE=y @@ -380,14 +355,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="msconn_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 @@ -415,10 +384,10 @@ CONFIG_PREALLOC_TIMERS=2 # # Stack and heap information # -CONFIG_IDLETHREAD_STACKSIZE=512 -CONFIG_USERMAIN_STACKSIZE=684 +CONFIG_IDLETHREAD_STACKSIZE=280 +CONFIG_USERMAIN_STACKSIZE=830 CONFIG_PTHREAD_STACK_MIN=256 -CONFIG_PTHREAD_STACK_DEFAULT=288 +CONFIG_PTHREAD_STACK_DEFAULT=340 # # Device Drivers @@ -480,6 +449,7 @@ CONFIG_SST25_SLOWWRITE=y # CONFIG_SENSORS is not set CONFIG_SERIAL=y # CONFIG_DEV_LOWCONSOLE is not set +CONFIG_SERIAL_REMOVABLE=y # CONFIG_16550_UART is not set CONFIG_ARCH_HAVE_USART2=y @@ -531,8 +501,8 @@ CONFIG_USBMSC=y CONFIG_USBMSC_EP0MAXPACKET=64 CONFIG_USBMSC_EPBULKOUT=2 CONFIG_USBMSC_EPBULKIN=3 -CONFIG_USBMSC_NWRREQS=4 -CONFIG_USBMSC_NRDREQS=4 +CONFIG_USBMSC_NWRREQS=2 +CONFIG_USBMSC_NRDREQS=2 CONFIG_USBMSC_BULKINREQLEN=512 CONFIG_USBMSC_BULKOUTREQLEN=512 CONFIG_USBMSC_VENDORID=0x584e @@ -551,7 +521,7 @@ CONFIG_CC3000_DEVMINOR=0 CONFIG_CC3000_SPI_MODE=0 CONFIG_CC3000_SPI_FREQUENCY=16000000 CONFIG_CC3000_WORKER_STACKSIZE=240 -CONFIG_CC3000_SELECT_STACKSIZE=368 +CONFIG_CC3000_SELECT_STACKSIZE=380 CONFIG_CC3000_UNSOLICED_STACKSIZE=264 # CONFIG_CC3000_PROBES is not set # CONFIG_WL_NRF24L01 is not set @@ -676,7 +646,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=0 # # Built-In Applications # -CONFIG_BUILTIN_PROXY_STACKSIZE=1024 +CONFIG_BUILTIN_PROXY_STACKSIZE=768 # # Examples @@ -827,7 +797,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_FILEIOSIZE=60 CONFIG_NSH_LINELEN=40 CONFIG_NSH_MAXARGUMENTS=6 CONFIG_NSH_NESTDEPTH=3 diff --git a/nuttx/configs/spark/usbnsh/defconfig b/nuttx/configs/spark/usbnsh/defconfig index b3eb0985c..244351da8 100644 --- a/nuttx/configs/spark/usbnsh/defconfig +++ b/nuttx/configs/spark/usbnsh/defconfig @@ -100,8 +100,8 @@ CONFIG_ARCH_HAVE_MPU=y # # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set -# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set -CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y +CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y +# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set # CONFIG_SERIAL_TERMIOS is not set # @@ -189,7 +189,7 @@ CONFIG_STM32_MEDIUMDENSITY=y # CONFIG_STM32_STM32F20XX is not set # CONFIG_STM32_STM32F30XX is not set # CONFIG_STM32_STM32F40XX is not set -CONFIG_STM32_DFU=y +# CONFIG_STM32_DFU is not set # # STM32 Peripheral Support @@ -199,17 +199,17 @@ CONFIG_STM32_DFU=y # CONFIG_STM32_ADC3 is not set # CONFIG_STM32_BKP is not set # CONFIG_STM32_CAN1 is not set -# CONFIG_STM32_CRC is not set -# CONFIG_STM32_DMA1 is not set +CONFIG_STM32_CRC=y +CONFIG_STM32_DMA1=y # CONFIG_STM32_DMA2 is not set # CONFIG_STM32_DAC1 is not set # CONFIG_STM32_DAC2 is not set -CONFIG_STM32_I2C1=y -CONFIG_STM32_I2C2=y +# CONFIG_STM32_I2C1 is not set +# CONFIG_STM32_I2C2 is not set # CONFIG_STM32_PWR is not set # CONFIG_STM32_SDIO is not set # CONFIG_STM32_SPI1 is not set -# CONFIG_STM32_SPI2 is not set +CONFIG_STM32_SPI2=y # CONFIG_STM32_TIM1 is not set # CONFIG_STM32_TIM2 is not set # CONFIG_STM32_TIM3 is not set @@ -218,15 +218,15 @@ CONFIG_STM32_I2C2=y # CONFIG_STM32_TIM6 is not set # CONFIG_STM32_TIM7 is not set # CONFIG_STM32_TIM8 is not set -CONFIG_STM32_USART1=y -# CONFIG_STM32_USART2 is not set +# CONFIG_STM32_USART1 is not set +CONFIG_STM32_USART2=y # CONFIG_STM32_USART3 is not set # CONFIG_STM32_UART4 is not set # CONFIG_STM32_UART5 is not set CONFIG_STM32_USB=y # CONFIG_STM32_IWDG is not set # CONFIG_STM32_WWDG is not set -CONFIG_STM32_I2C=y +CONFIG_STM32_SPI=y # # Alternate Pin Mapping @@ -333,7 +333,7 @@ CONFIG_RR_INTERVAL=200 CONFIG_TASK_NAME_SIZE=0 # CONFIG_SCHED_HAVE_PARENT is not set # CONFIG_JULIAN_TIME is not set -CONFIG_START_YEAR=2009 +CONFIG_START_YEAR=2013 CONFIG_START_MONTH=10 CONFIG_START_DAY=23 # CONFIG_DEV_CONSOLE is not set -- cgit v1.2.3